commit: 07718e1dd14ac33f2a272f2302fed946bdb664b7
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 24 08:10:48 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Dec 24 08:34:27 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07718e1d
dev-python/redis-py: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/redis-py/Manifest | 1 -
.../files/redis-py-3.5.3-fix-user-tests.patch | 72 -------------------
dev-python/redis-py/redis-py-3.5.3.ebuild | 80 ----------------------
3 files changed, 153 deletions(-)
diff --git a/dev-python/redis-py/Manifest b/dev-python/redis-py/Manifest
index 60c1bce0736f..5f684546ee7f 100644
--- a/dev-python/redis-py/Manifest
+++ b/dev-python/redis-py/Manifest
@@ -1,2 +1 @@
-DIST redis-py-3.5.3.tar.gz 141112 BLAKE2B
b953d553a3cfa2d6ba6f5aa35dfaf93865acbfad0e901a96082c3b1c027dc23b6ceedde185f24e86772522fbbf4f0a4d18e115a6b40aff6a65450bbe397d5c07
SHA512
eae6ac6b3e0f1366a9c29e5e2d9a5210e4627e62e3006159b1c290f36cd9c1c2c12cafe0944f7a010e04632b517874f230aa9411491993b7ecf2080546217206
DIST redis-py-4.0.2.tar.gz 2262717 BLAKE2B
7db99843b4ee354b0841de1cacca001901b0614868e6cd545edb0f3705b7dc7d7a0ee755e2184ec1fb080a845a2f193ff5ab5a4dd99006eed6b9a1c89fbee131
SHA512
3f73ddd2ceb551fa447cfb4ecdc1d393957bbfd8c184ae3d357f9f47fff860f1c4684ec0fc3cb85fea530454456c17a98a2a56e592bef4cd9ad17bb405c1a0f7
diff --git a/dev-python/redis-py/files/redis-py-3.5.3-fix-user-tests.patch
b/dev-python/redis-py/files/redis-py-3.5.3-fix-user-tests.patch
deleted file mode 100644
index 36ff4b0bf60a..000000000000
--- a/dev-python/redis-py/files/redis-py-3.5.3-fix-user-tests.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff --git a/tests/test_commands.py b/tests/test_commands.py
-index 65e877c..448d30c 100644
---- a/tests/test_commands.py
-+++ b/tests/test_commands.py
-@@ -105,25 +105,24 @@ class TestRedisCommands(object):
-
- # test enabled=False
- assert r.acl_setuser(username, enabled=False, reset=True)
-- assert r.acl_getuser(username) == {
-- 'categories': ['-@all'],
-- 'commands': [],
-- 'enabled': False,
-- 'flags': ['off'],
-- 'keys': [],
-- 'passwords': [],
-- }
-+ acl = r.acl_getuser(username)
-+ assert acl['categories'] == ['-@all']
-+ assert acl['commands'] == []
-+ assert acl['keys'] == []
-+ assert acl['passwords'] == []
-+ assert 'off' in acl['flags']
-+ assert acl['enabled'] is False
-
- # test nopass=True
- assert r.acl_setuser(username, enabled=True, reset=True, nopass=True)
-- assert r.acl_getuser(username) == {
-- 'categories': ['-@all'],
-- 'commands': [],
-- 'enabled': True,
-- 'flags': ['on', 'nopass'],
-- 'keys': [],
-- 'passwords': [],
-- }
-+ acl = r.acl_getuser(username)
-+ assert acl['categories'] == ['-@all']
-+ assert acl['commands'] == []
-+ assert acl['keys'] == []
-+ assert acl['passwords'] == []
-+ assert 'on' in acl['flags']
-+ assert 'nopass' in acl['flags']
-+ assert acl['enabled'] is True
-
- # test all args
- assert r.acl_setuser(username, enabled=True, reset=True,
-@@ -135,7 +134,7 @@ class TestRedisCommands(object):
- assert set(acl['categories']) == set(['-@all', '+@set', '+@hash'])
- assert set(acl['commands']) == set(['+get', '+mget', '-hset'])
- assert acl['enabled'] is True
-- assert acl['flags'] == ['on']
-+ assert 'on' in acl['flags']
- assert set(acl['keys']) == set([b'cache:*', b'objects:*'])
- assert len(acl['passwords']) == 2
-
-@@ -154,7 +153,7 @@ class TestRedisCommands(object):
- assert set(acl['categories']) == set(['-@all', '+@set', '+@hash'])
- assert set(acl['commands']) == set(['+get', '+mget'])
- assert acl['enabled'] is True
-- assert acl['flags'] == ['on']
-+ assert 'on' in acl['flags']
- assert set(acl['keys']) == set([b'cache:*', b'objects:*'])
- assert len(acl['passwords']) == 2
-
-@@ -193,7 +192,7 @@ class TestRedisCommands(object):
-
- assert r.acl_setuser(username, enabled=False, reset=True)
- users = r.acl_list()
-- assert 'user %s off -@all' % username in users
-+ assert len(users) == 2
-
- @skip_if_server_version_lt(REDIS_6_VERSION)
- def test_acl_setuser_categories_without_prefix_fails(self, r, request):
diff --git a/dev-python/redis-py/redis-py-3.5.3.ebuild
b/dev-python/redis-py/redis-py-3.5.3.ebuild
deleted file mode 100644
index bd3db6072183..000000000000
--- a/dev-python/redis-py/redis-py-3.5.3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="redis"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python client for Redis key-value store"
-HOMEPAGE="https://github.com/andymccurdy/redis-py";
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
- test? (
- dev-db/redis
- dev-python/mock[${PYTHON_USEDEP}]
- )
-"
-
-PATCHES=(
- # https://github.com/andymccurdy/redis-py/issues/1459
- "${FILESDIR}/${P}-fix-user-tests.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
- distutils-r1_python_prepare_all
-
- # Make sure that tests will be used from BUILD_DIR rather than cwd.
- mv tests tests-hidden || die
-
- # Correct local import patch syntax
- sed \
- -e 's:from .conftest:from conftest:' \
- -e 's:from .test_pubsub:from test_pubsub:' \
- -i tests-hidden/test_*.py \
- || die
-}
-
-python_compile() {
- distutils-r1_python_compile
-
- if use test; then
- cp -r tests-hidden "${BUILD_DIR}"/tests || die
- fi
-}
-
-src_test() {
- local redis_pid="${T}"/redis.pid
- local redis_port=6379
- local redis_test_config="
- daemonize yes
- pidfile ${redis_pid}
- port ${redis_port}
- bind 127.0.0.1
- "
-
- # Spawn Redis itself for testing purposes
- # NOTE: On sam@'s machine, spawning Redis can hang in the sandbox.
- # I'm not restricting tests yet because this doesn't happen for anyone
else AFAICT.
- elog "Spawning Redis"
- elog "NOTE: Port ${redis_port} must be free"
- "${EPREFIX}"/usr/sbin/redis-server - <<< "${redis_test_config}" || die
-
- # Run the tests
- distutils-r1_src_test
-
- # Clean up afterwards
- kill "$(<"${redis_pid}")" || die
-}
