From 0f15659d48c193027158492acb726297501202c5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Dec 2021 20:34:27 +0000 Subject: gentoo xmass resync : 25.12.2021 --- dev-python/redis-py/Manifest | 5 +- .../files/redis-py-3.5.3-fix-user-tests.patch | 72 ------------------- dev-python/redis-py/redis-py-3.5.3.ebuild | 80 ---------------------- dev-python/redis-py/redis-py-4.0.2.ebuild | 2 +- 4 files changed, 2 insertions(+), 157 deletions(-) delete mode 100644 dev-python/redis-py/files/redis-py-3.5.3-fix-user-tests.patch delete mode 100644 dev-python/redis-py/redis-py-3.5.3.ebuild (limited to 'dev-python/redis-py') diff --git a/dev-python/redis-py/Manifest b/dev-python/redis-py/Manifest index 835f6eca9321..7a099d4a90d4 100644 --- a/dev-python/redis-py/Manifest +++ b/dev-python/redis-py/Manifest @@ -1,6 +1,3 @@ -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 DIST redis-py-4.0.2.tar.gz 2262717 BLAKE2B 7db99843b4ee354b0841de1cacca001901b0614868e6cd545edb0f3705b7dc7d7a0ee755e2184ec1fb080a845a2f193ff5ab5a4dd99006eed6b9a1c89fbee131 SHA512 3f73ddd2ceb551fa447cfb4ecdc1d393957bbfd8c184ae3d357f9f47fff860f1c4684ec0fc3cb85fea530454456c17a98a2a56e592bef4cd9ad17bb405c1a0f7 -EBUILD redis-py-3.5.3.ebuild 1806 BLAKE2B d9e3f93ec21396b0778645c4cf9c4e5e97f67b239f50ddcbf9eeab17a049a670b349375c492ec67cebc39de46a9173aa95945b99707b0e85807bb9d7421cc0b9 SHA512 22c0588b1af33c055e8ffc5058da43c3e9201650094f54694b940ec0ad18fbc5c4979ead5004b180b5bfacd72e1007e3c2082f859ebe46060e35942ce1ecfc76 -EBUILD redis-py-4.0.2.ebuild 1438 BLAKE2B 8c41a4909cc140d8e61656ecfbfcba83369bccbd9aa5050ebac03d5d12177ea2e90f22e969c684e1a4301b6f67879717ae79d3fc357a5abe1f4f64e57f18ade1 SHA512 fb19dd1a11d0ad73789e197e6810a4d8866701893a1939900eb3fb176031e86f3b43335fda545c9b37916c8ef46973e02c41124c351cd20e175e51846f448c3c +EBUILD redis-py-4.0.2.ebuild 1431 BLAKE2B bcc4ee55d90faddb457a90ee849d21c715152a1f1d214dfb663395772ced34405e15c2c873dac437e6f9def958032db62a947d502bdf9e38ac0ea5b7d9716f4b SHA512 82f07bab5e1dbbf43eeeeafe1e56c2eddf1200069d4896c59ea9dda914822376ffe29dff154d9991002a83c77b6dd85a476aa99350713c20f33f341fb88131c2 MISC metadata.xml 506 BLAKE2B 0e5747e826132dd365bdf6d3a63f0936ed476bc69c4c4d55126e692039046f51f69b193ead0baa181090b11f69ab2a49220d8f906f9fe3fc18331b76ff9e0b0f SHA512 725d650bfe345b132588930a18ade44182ec07f6697d2fd8806dc208ab1556939926e8899fc6d43691101d971f9c1e011fb8a5675fdde4698dbf4c230db15c75 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 -} diff --git a/dev-python/redis-py/redis-py-4.0.2.ebuild b/dev-python/redis-py/redis-py-4.0.2.ebuild index e5d090f56dec..fac315489b31 100644 --- a/dev-python/redis-py/redis-py-4.0.2.ebuild +++ b/dev-python/redis-py/redis-py-4.0.2.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86" RDEPEND=" dev-python/deprecated[${PYTHON_USEDEP}]" -- cgit v1.2.3