diff options
Diffstat (limited to 'dev-python/redis-py')
| -rw-r--r-- | dev-python/redis-py/Manifest | 5 | ||||
| -rw-r--r-- | dev-python/redis-py/files/redis-py-3.5.3-fix-user-tests.patch | 72 | ||||
| -rw-r--r-- | dev-python/redis-py/metadata.xml | 1 | ||||
| -rw-r--r-- | dev-python/redis-py/redis-py-3.5.3.ebuild | 15 |
4 files changed, 84 insertions, 9 deletions
diff --git a/dev-python/redis-py/Manifest b/dev-python/redis-py/Manifest index aa3ea6daa8f7..cfb79d987bd5 100644 --- a/dev-python/redis-py/Manifest +++ b/dev-python/redis-py/Manifest @@ -1,3 +1,4 @@ +AUX redis-py-3.5.3-fix-user-tests.patch 2799 BLAKE2B ba74d41506b072455fe901d9ac4d819e3240b7ac63c06392fb7696aa2f026e10ea8a59403cae5ed3b5276aaad811f55a0447412039dd5382810bc853ad8d8b16 SHA512 ce203a5c52607accb3b30b591b1fcc0f82455053896f77b8f9561f5b0c4189cb58406d8261d5ee334b3b81fe1a8333ca9f2779594d0454e18d6742323c313a2e DIST redis-py-3.5.3.tar.gz 141112 BLAKE2B b953d553a3cfa2d6ba6f5aa35dfaf93865acbfad0e901a96082c3b1c027dc23b6ceedde185f24e86772522fbbf4f0a4d18e115a6b40aff6a65450bbe397d5c07 SHA512 eae6ac6b3e0f1366a9c29e5e2d9a5210e4627e62e3006159b1c290f36cd9c1c2c12cafe0944f7a010e04632b517874f230aa9411491993b7ecf2080546217206 -EBUILD redis-py-3.5.3.ebuild 1735 BLAKE2B 58e800f6a2decfd1632ea33c1b1e393b931825545b735fdf2e739dd20ae3341bc8df49c8ec86292a1caad29d4ae84d7b3f36c54dbd2b4a9dd4a214e0a6841af9 SHA512 4f89f52583d8dac602a2e6acb64e36479e3acb47885298f05d24904304e301c0950637ce2945599b07f173396997567262160b6a7c87f71d2a947d7281bf7bd0 -MISC metadata.xml 536 BLAKE2B e146a8713662d8d635cf9e0927223bb427cbb4f684d7b484d3c005e84a7b961f587b7e31123d27ea8be7ac7ce83890c54a670b6d1062f221bacc496229f798ab SHA512 c651a0f6dfab0e857e04ba15924937a42d74c913cc82a1d8f46a0641f6e4fe85315da1a76cb1bf3a8ba3d4a3ee6649872af221b7c1196100cde107d9454c5dd0 +EBUILD redis-py-3.5.3.ebuild 1806 BLAKE2B d9e3f93ec21396b0778645c4cf9c4e5e97f67b239f50ddcbf9eeab17a049a670b349375c492ec67cebc39de46a9173aa95945b99707b0e85807bb9d7421cc0b9 SHA512 22c0588b1af33c055e8ffc5058da43c3e9201650094f54694b940ec0ad18fbc5c4979ead5004b180b5bfacd72e1007e3c2082f859ebe46060e35942ce1ecfc76 +MISC metadata.xml 511 BLAKE2B 6b9a364015a9b526496a892cb8d65ff20a347b7781813312272845504c36db9ee2a351169c306d0130dcb6cc71365d68ba1fc327140f5dda290c5e7281f0d6ed SHA512 9fba3ab00a43d2b876b6cbce7be1946a4fadfe22bcd360af49b738632583385f9607bf28fd828eff543f7b8877b6c86e8492367536dd44239800f3ddcd4d0bff 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 new file mode 100644 index 000000000000..36ff4b0bf60a --- /dev/null +++ b/dev-python/redis-py/files/redis-py-3.5.3-fix-user-tests.patch @@ -0,0 +1,72 @@ +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/metadata.xml b/dev-python/redis-py/metadata.xml index add34b6842b7..0d56d7eae1f1 100644 --- a/dev-python/redis-py/metadata.xml +++ b/dev-python/redis-py/metadata.xml @@ -14,5 +14,4 @@ <remote-id type="pypi">redis</remote-id> <remote-id type="github">andymccurdy/redis-py</remote-id> </upstream> - <stabilize-allarches/> </pkgmetadata> diff --git a/dev-python/redis-py/redis-py-3.5.3.ebuild b/dev-python/redis-py/redis-py-3.5.3.ebuild index 6954d82304d8..bd3db6072183 100644 --- a/dev-python/redis-py/redis-py-3.5.3.ebuild +++ b/dev-python/redis-py/redis-py-3.5.3.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} pypy3 ) +PYTHON_COMPAT=( python3_{8..10} pypy3 ) inherit distutils-r1 @@ -18,16 +18,21 @@ S="${WORKDIR}/${MY_P}" LICENSE="MIT" SLOT="0" KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" -IUSE="test" -RESTRICT="!test? ( test )" -DEPEND=" +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 @@ -73,5 +78,3 @@ src_test() { # Clean up afterwards kill "$(<"${redis_pid}")" || die } - -distutils_enable_tests pytest |