From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- dev-python/redis-py/Manifest | 11 +--- .../files/redis-py-2.10.5-test-finalize.patch | 19 ------- dev-python/redis-py/redis-py-2.10.5.ebuild | 66 ---------------------- dev-python/redis-py/redis-py-2.10.6.ebuild | 66 ---------------------- dev-python/redis-py/redis-py-2.9.1.ebuild | 65 --------------------- dev-python/redis-py/redis-py-3.2.1.ebuild | 4 +- dev-python/redis-py/redis-py-3.3.11.ebuild | 64 +++++++++++++++++++++ 7 files changed, 69 insertions(+), 226 deletions(-) delete mode 100644 dev-python/redis-py/files/redis-py-2.10.5-test-finalize.patch delete mode 100644 dev-python/redis-py/redis-py-2.10.5.ebuild delete mode 100644 dev-python/redis-py/redis-py-2.10.6.ebuild delete mode 100644 dev-python/redis-py/redis-py-2.9.1.ebuild create mode 100644 dev-python/redis-py/redis-py-3.3.11.ebuild (limited to 'dev-python/redis-py') diff --git a/dev-python/redis-py/Manifest b/dev-python/redis-py/Manifest index 2f1574712f71..32d8726991f3 100644 --- a/dev-python/redis-py/Manifest +++ b/dev-python/redis-py/Manifest @@ -1,10 +1,5 @@ -AUX redis-py-2.10.5-test-finalize.patch 543 BLAKE2B 5bb883a674bee5fd4c7466a7a7b08473cf90540a7e78cdef53e425a0b5f3282dac06857b3269d0d3bcb602f716062d68cf7ddcf128b7934124cb778da5d60265 SHA512 bd1e48117d6ec89fcf86dde41b38deab3782e4e1ee6038123d3b225214b9843703067ca0d4b813d7bf8da1f64e45ff19a1b5a9337f2a9953a7f3ef9766b7a441 -DIST redis-py-2.10.5.tar.gz 88610 BLAKE2B 092efe4fcbc500a59981fc2d8574b70ee322ce7ccba012e5babd022f30abb017e53f093b3f4d876a297ab2e4403a57e749582d4027f1efa53efcbab0214347b7 SHA512 b2e6cb85c274c8f1c63e27256bbab816d016a68c324bf7092cf53feae819a34fa94f45565b0f209ee981919d793b2963462eb1a6f841e9dde9885802e0ebbe8f -DIST redis-py-2.10.6.tar.gz 97299 BLAKE2B 9fea87b5c8ae0f3574651717e664cda62ca7752e44c4e60f4a50b82b53a52a5d005dc79c72afa58abfb807bf303f46335761129c54a2ef8e4f524451543c6c96 SHA512 e7df464bc3b26e23f6a0d2d2896306c1e4792b9a2a4ecaea6dd8690ffa17853cc85345f063307295dd3c2da399f7f203f4b21d785f7e073c0501732257419dad -DIST redis-py-2.9.1.tar.gz 62204 BLAKE2B 633dd00d5aa984ac4dfb223aa685f8fa6913f4f00bb5c5c231dc77b6e8d33f1cd57c2e2bc07c4ec4658ca3b7675fd172919187fa2e95afb8eb5345f65dcbca00 SHA512 6b4912acafb31c87a5bc47b0420834aa9d1eba57feb0bbacdea943b746fe2f24aee4c9f13e7b03ae4edc562043b22c370cc7f53e45be07c5408cfa9852f8ea38 DIST redis-py-3.2.1.tar.gz 124692 BLAKE2B fc7a773ab0a7e13f034b9efa174806b024733f9263b962599ce72e9a0c88b11964c26081375b6ae2de49939b59a561c145ae1b69c262b801f9b887befe9dcc0a SHA512 be51642a8895325c3c61993dd83c3299a9e2cefc1010e04f182833f720ff161bea43d3a57d28afba991949fcf6e967c4f778002967641bffe651d5db384f2e08 -EBUILD redis-py-2.10.5.ebuild 1476 BLAKE2B ed2ccf247b45e9c717b20e08ea14f35e15b3b778cf4c060dd20702efc9a3934120c3dd45d6d31f63ceeee6ef64ceacb0d4bfeee0041303cd28b35e8290c28cfb SHA512 164ebef22114ce0626efd85ac0864cb31aac0e1237dd9f97c3b05ab67f7f9eeac61d06761f3e41e39b55275b2b982ece62c121bb2a6d6aca62e1f0b9ba7ca826 -EBUILD redis-py-2.10.6.ebuild 1489 BLAKE2B f85c9e984b361f23a3b1670fc8a25b3df62602d52be8ab79e5c6d59ea67a792667990b0e3dd454141ab5d4e4c0582f662f2bd90178acdd4e015fde06123086e6 SHA512 2437a67aa59fb30e37930cd9fd65acdc45dc46167ca2678f41e9c523f4e87bf7a0a59314f7ffbcb60a4dfb359677b88b45a4ed92acc85b1f18dab7616e4aea09 -EBUILD redis-py-2.9.1.ebuild 1547 BLAKE2B 2eb71e384748be8f604092e69cd1f1d58196bd85c9066e20a30339329d74053122aad83a0ef39be5b29d3de0f1d9978e5ff608c9d63cfae9d09969dfe57f8b70 SHA512 83a282dafeed1cac642ba4b047f26d1f6e7388238db5359540f8e2dae02d922e8e591294b0641153fa78f76ec315b45afe5459daaea136bb13029de45ed6e0ca -EBUILD redis-py-3.2.1.ebuild 1475 BLAKE2B a1197835b47d0adae73a5be838e58bc5f8c7215ed58de477860b3fd401878f2744d82a635490ef338c361fc2663835b4d80ba1b07229864396d3fe093eb91fb3 SHA512 ffad7f3017fcedb8932cbd507a1de2d95bce31701192a72e88355151a1849215cda773ff980cc286036858bc990edcb582c79a1fc21fb56d27c27c5f2da51762 +DIST redis-py-3.3.11.tar.gz 131072 BLAKE2B 6becafba3da22bae796a4a9ba55d11a61d9ed1a8b693a734d4ef3f0e463c0c39a05c01546225f69eb36a788779d6e45d0136e1a6d6856ec63c3dd07994b5db9a SHA512 a32327fcebc6242367c0eda6c6dcd1a15d5d575527af2e9de0d76e05bc4afc7402566d9254e467663b81907a310731af3041236b6b135f3b8ff1429a502c1000 +EBUILD redis-py-3.2.1.ebuild 1468 BLAKE2B 2fe39db26b098d9a6fefde774ccebaeac8c720301e28bc90ada6e7e729c1069a6361910471bf1d15a1e0bdde3c307e82d054eb477a6a6823ff6145c734f9343a SHA512 6fb92bb8158c5e8c8b4044803462f997821163e36f817addf5e3891914896740b21ffbb6522356dda3d055385f3084ed26eb9aab5b3928e99fb904110b5b1cdb +EBUILD redis-py-3.3.11.ebuild 1407 BLAKE2B 49bcc15c60ea4565bc3e4141a9a0baf7e2ec8807aa5041f9e3f730f4edb9cc9ec088597f3d07fa615a52c1383c027fcb6ceddb5f6bd163310acdba8e5d93e399 SHA512 ee542ed444bf53052660207b3dc352de8dca161153389bf166b172644631dbfe4f9ae877ec4efc612e724ba7c51921b6a24a2cc28e6cfdc5fd0e9d2e1ae28e6b MISC metadata.xml 380 BLAKE2B 993e671ed9c6a9649a8dc0d95207b4dc1f90cb38eb8af6e470fc9e18b496768b541c033ee961957d56ee93b335c54447b741fad38f71498188480822350b508b SHA512 5e03d25770ee53beb71d1efa039401a5598572bbf6cd441c904fb5c074d212c0c05934c6f86abb566e913ac65bd84db3cdaca8b83c182dad57d0fcffdeb9aa4b diff --git a/dev-python/redis-py/files/redis-py-2.10.5-test-finalize.patch b/dev-python/redis-py/files/redis-py-2.10.5-test-finalize.patch deleted file mode 100644 index 1a807480dfb0..000000000000 --- a/dev-python/redis-py/files/redis-py-2.10.5-test-finalize.patch +++ /dev/null @@ -1,19 +0,0 @@ - setup.py | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/setup.py b/setup.py -index ed8fd5f..ab648a3 100644 ---- a/setup.py -+++ b/setup.py -@@ -9,11 +9,6 @@ try: - from setuptools.command.test import test as TestCommand - - class PyTest(TestCommand): -- def finalize_options(self): -- TestCommand.finalize_options(self) -- self.test_args = [] -- self.test_suite = True -- - def run_tests(self): - # import here, because outside the eggs aren't loaded - import pytest diff --git a/dev-python/redis-py/redis-py-2.10.5.ebuild b/dev-python/redis-py/redis-py-2.10.5.ebuild deleted file mode 100644 index f12abebfef1c..000000000000 --- a/dev-python/redis-py/redis-py-2.10.5.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{5,6} pypy 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" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-db/redis - >=dev-python/pytest-2.5.0[${PYTHON_USEDEP}] )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/${P}-test-finalize.patch -) - -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:' \ - -i tests-hidden/{test_connection_pool.py,test_commands.py,test_encoding.py,test_pubsub.py} \ - || die -} - -python_compile() { - distutils-r1_python_compile - - if use test; then - cp -r tests-hidden "${BUILD_DIR}"/tests || die - fi -} - -python_test() { - local sock="${T}/redis.sock" - - "${EPREFIX}/usr/sbin/redis-server" - <<- EOF - daemonize yes - pidfile "${T}/redis.pid" - unixsocket ${sock} - EOF - - PYTHONPATH="${S}:${S}/tests-hidden" - esetup.py test --verbose - kill $(<"${T}/redis.pid") -} diff --git a/dev-python/redis-py/redis-py-2.10.6.ebuild b/dev-python/redis-py/redis-py-2.10.6.ebuild deleted file mode 100644 index 74ead466b5ae..000000000000 --- a/dev-python/redis-py/redis-py-2.10.6.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{5,6} pypy 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" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-db/redis - >=dev-python/pytest-2.5.0[${PYTHON_USEDEP}] )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/${PN}-2.10.5-test-finalize.patch -) - -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:' \ - -i tests-hidden/{test_connection_pool.py,test_commands.py,test_encoding.py,test_pubsub.py} \ - || die -} - -python_compile() { - distutils-r1_python_compile - - if use test; then - cp -r tests-hidden "${BUILD_DIR}"/tests || die - fi -} - -python_test() { - local sock="${T}/redis.sock" - - "${EPREFIX}/usr/sbin/redis-server" - <<- EOF - daemonize yes - pidfile "${T}/redis.pid" - unixsocket ${sock} - EOF - - PYTHONPATH="${S}:${S}/tests-hidden" - esetup.py test --verbose - kill $(<"${T}/redis.pid") -} diff --git a/dev-python/redis-py/redis-py-2.9.1.ebuild b/dev-python/redis-py/redis-py-2.9.1.ebuild deleted file mode 100644 index e0002c9cb7bf..000000000000 --- a/dev-python/redis-py/redis-py-2.9.1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( python{2_7,3_5} pypy ) - -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" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-db/redis )" -RDEPEND="" - -S="${WORKDIR}/${MY_P}" - -python_prepare_all() { - # Disable pubsub and encoding tests, they do not seem to support - # UNIX socket connectivity. - sed -i -e '/PubSub/d' -e '/Encoding/d' \ - -e '/use_hiredis:/d' tests/__init__.py || die - - # Make sure that tests will be used from BUILD_DIR rather than cwd. - mv tests tests-hidden || die - - distutils-r1_python_prepare_all -} - -python_compile() { - distutils-r1_python_compile - - if use test; then - cp -r tests-hidden "${BUILD_DIR}"/tests || die - fi -} - -python_test() { - local pidfile=${T}/redis-${EPYTHON}.pid - local sock=${T}/redis-${EPYTHON}.sock - - sed -i -e "s:port=6379:unix_socket_path=\"${sock}\":" \ - "${BUILD_DIR}"/tests/*.py || die - - # XXX: find a way to make sure it is killed - - "${EPREFIX}"/usr/sbin/redis-server \ - --pidfile "${pidfile}" \ - --port 0 \ - --unixsocket "${sock}" \ - --daemonize yes || die - PYTHONPATH="${PYTHONPATH}:${BUILD_DIR}" \ - esetup.py test - kill "$(<"${pidfile}")" -} diff --git a/dev-python/redis-py/redis-py-3.2.1.ebuild b/dev-python/redis-py/redis-py-3.2.1.ebuild index ee675a119cc8..ef7ba5ab5ca7 100644 --- a/dev-python/redis-py/redis-py-3.2.1.ebuild +++ b/dev-python/redis-py/redis-py-3.2.1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 ) +PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 ) inherit distutils-r1 diff --git a/dev-python/redis-py/redis-py-3.3.11.ebuild b/dev-python/redis-py/redis-py-3.3.11.ebuild new file mode 100644 index 000000000000..42add4480b6e --- /dev/null +++ b/dev-python/redis-py/redis-py-3.3.11.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python2_7 python3_{6,7,8} 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" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="" +DEPEND="test? ( + dev-db/redis + dev-python/mock[${PYTHON_USEDEP}] + >=dev-python/pytest-2.7.0[${PYTHON_USEDEP}] )" + +S="${WORKDIR}/${MY_P}" + +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 +} + +python_test() { + local sock="${T}/redis.sock" + + "${EPREFIX}/usr/sbin/redis-server" - <<- EOF + daemonize yes + pidfile "${T}/redis.pid" + unixsocket ${sock} + EOF + + PYTHONPATH="${S}:${S}/tests-hidden" + esetup.py test --verbose + kill $(<"${T}/redis.pid") +} -- cgit v1.2.3