From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- dev-python/kombu/Manifest | 11 +++ dev-python/kombu/files/kombu-4.0.2-dict-iter.patch | 24 +++++ dev-python/kombu/files/kombu-NA-tests-fix.patch | 16 +++ dev-python/kombu/kombu-3.0.37.ebuild | 110 +++++++++++++++++++++ dev-python/kombu/kombu-4.0.2.ebuild | 76 ++++++++++++++ dev-python/kombu/kombu-4.1.0.ebuild | 76 ++++++++++++++ dev-python/kombu/metadata.xml | 17 ++++ 7 files changed, 330 insertions(+) create mode 100644 dev-python/kombu/Manifest create mode 100644 dev-python/kombu/files/kombu-4.0.2-dict-iter.patch create mode 100644 dev-python/kombu/files/kombu-NA-tests-fix.patch create mode 100644 dev-python/kombu/kombu-3.0.37.ebuild create mode 100644 dev-python/kombu/kombu-4.0.2.ebuild create mode 100644 dev-python/kombu/kombu-4.1.0.ebuild create mode 100644 dev-python/kombu/metadata.xml (limited to 'dev-python/kombu') diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest new file mode 100644 index 000000000000..eda6a4677a8c --- /dev/null +++ b/dev-python/kombu/Manifest @@ -0,0 +1,11 @@ +AUX kombu-4.0.2-dict-iter.patch 1022 SHA256 c0d5232c6399f47075797e016708605a09711858c8d79d19f77ab244a2a81414 SHA512 fbb52e5fa20b4d295cd7414ef1e8b49fee6cd31e465b4059f01ccd65d96c966af0e62388fa2f486a152fe7174deb75a889c86a7cb1eb4c02a886e2c57fe0bb27 WHIRLPOOL d14ff55251b6392ee52645b2ea617a0e4c465274d8472a0ab0fce66cba1d99d4847dccc18bfa1c2a7c4b0ebc8d1e6a60294507a43652063a57506d76c9ed1387 +AUX kombu-NA-tests-fix.patch 495 SHA256 e83b9ca823d1a972a203fc02cce2cf1ab740e65957e89be50fc4343def926ac4 SHA512 0399ddcd6992182577a09e5892b042ab2c232a6f86fda46a8ac4b6254ad73fd2fc342b863d59154371a266dd0927ae72c299c4ad16bc1c8cad557d26865ff264 WHIRLPOOL 55ba444b7607fa169cf53463965520c82bdf74ce2781a127c844d496a4f9c208ff366c24a3832839ddea14bff3ee3b545d8ed960cde524688cc916ca114282e9 +DIST kombu-3.0.37.tar.gz 411790 SHA256 e064a00c66b4d1058cd2b0523fb8d98c82c18450244177b6c0f7913016642650 SHA512 ba9bb00e23ce2d3da87eb07aacff8d63ef9879e6ca9f3fe82653cc2ee91610199fe8fc778d7c2e00df05b46130ecda0bdeceda48192b8af1fb0eca41fbb44712 WHIRLPOOL 1e3344eb25024e94d341a3928bd04a9fd13bb41fefd7254e5f2dd70a8b235ae48b93d9b003b21d9ccde4ebdb8d1f349d9af6d54b51c74d6c6b1ee7913ee06919 +DIST kombu-4.0.2.tar.gz 418051 SHA256 d0fc6f2a36610a308f838db4b832dad79a681b516ac1d1a1f9d42edb58cc11a2 SHA512 99be6aa833eedc02897da90ebbd838bf0ac2a21db91350e235fae99ce31607cbc749f73f99d24f76acfc68b81d6263688d35b72ed62bb21d024a3ab385fa666e WHIRLPOOL e140f700c2e00ab892b54664d61c56343fb4d51f65fc0c42e2b4e0b0f75836889f5746061db1f31d3ba5f5981946d47d29ba64b8e6f0561fec054b77167d090e +DIST kombu-4.1.0.tar.gz 421875 SHA256 4249d9dd9dbf1fcec471d1c2def20653c9310dd1a217272d77e4844f9d5273cb SHA512 fc104a3f974fabf090cc257b1a7623af6048f4630c6c2a9bb693fe69d77b6cdab36135a290a41056c1f854f61cce8fc2aa6b7880e9273581bfdfa162b5724861 WHIRLPOOL 88b59ce41218e7a585b6d9b8240130d7a88c19df85f8cd74acb0263252dd16d4d631f8af546b45555e8aeec4f048a808d55e1e3fb8e9895d0e46cf0cd20a5d68 +EBUILD kombu-3.0.37.ebuild 3727 SHA256 95926f13216948e1b97cb1db93091e4d93981c8aa05dd58be3f95e3e018e8446 SHA512 4d82688457a71ad8606b499a21a662495b049cba0561ca4647f730d67fe9c57e768350af90f9dd5d3e395d17d0ba52c9396c7f8f1053e3cbce17a8eb1231420a WHIRLPOOL 39128a84b54637ad837d7af3d1f638893475baa13d31ca1b8ee2673afc3f8581e76a746631c92ae4a818998eb6ba9087d1b4e3dad1c0a9e2faea41fc69da723d +EBUILD kombu-4.0.2.ebuild 2141 SHA256 f93841d5361289ce8fb055eaf09fdced4769f1437d3bf0a40e3c842ed6f822f0 SHA512 816f2b3f8e1381c482c6945612ad8f41d92fa3b85dd0cf45461a7494833a603cdbf0f99cdacae65fbc61e7ea03133a5546358b34db7f10de93aff68a2af17d78 WHIRLPOOL c16a515d958f87999bbaa1c787e9097d5b0beb9cee7d0a873cdf87087f411687a8ce5435457eb1b6f1dddc61c03534c0e2e16f9783d8031026c781ac954cd2b1 +EBUILD kombu-4.1.0.ebuild 2148 SHA256 228db6f494848590e2eea9d5a17032c01aa163b04c1e24525ca465033d6a1aab SHA512 d1ae7cc79599172007b374d324476cb52bca0e143808c637020d8f9eec1cb6d86c9ce77ed555fd499e44d010a9ead284fd100bb5112e07fb1a9bf50ce193ecb3 WHIRLPOOL bcb10c12b24bc354fd4d5f7eaaf4156b79bf55374ac28392b3e8b9d6d89fe6ae50b4c717ee718c908cdb77c248462c78636c9675dc1b99c6e59fcde83e4d8470 +MISC ChangeLog 5918 SHA256 a40005f1ecd918db749fc513ffa5b06924ad153dc0cea9343fae0cbb240bdfbf SHA512 01fdcdb43245b848cd11496db9fd633e770f226c09bc967413686671e80981e0015d3ad26a04d79574a257d6c950096d3e87494233a8d4719baaefef9c53f7b1 WHIRLPOOL 31d498ad1a477cfe347f730125e9d71c0fa6469e44330f73bc16e52fce55e9bdecdbb9ceb851a9fe8ef2bcd4bde7fb3fb2aee55e515cdcbb2a732dff9c081b1f +MISC ChangeLog-2015 7197 SHA256 7391125e7caf0a3da3ee1df44f913d0e01f6a42fb480e4dd02b91e54dd94aef3 SHA512 bc9033f772daffa0017cf4c7606a520e7ecb8fdaa4e5baafc9a5ddaf1b8860ac18c12598d49ad29a96dd71525d3484c16f85da13f029b96e025b9ef941fd86e0 WHIRLPOOL a85a4996943ae223b5151dba92ee3a87c73538caefb27b1e50c563a470e5eb95cb87b8fe4cbdcc511a2e695ed59c8b89517227da6ea2fdbb15d50e6696b34f99 +MISC metadata.xml 576 SHA256 ebe56d377d4dbaef969068352f3594b153870ce22c3a93606f56f44caa5c7226 SHA512 9d5fccd7c511196d4c98b80dd668e4f683d52335d3eee7fa372558091d131f1305aedd4bbcaaa895fe25679bb8912a4452f3f69fbd37ea45a5780c621cc1ae9b WHIRLPOOL 3b2ce876af34015bace1956bb03e9f14be1fd3352dcdfa26cbabf104c774db490a1661c1d8a90fccc8b7883e2bd024c6d22482a637a8d6eb06f919708dc14b3e diff --git a/dev-python/kombu/files/kombu-4.0.2-dict-iter.patch b/dev-python/kombu/files/kombu-4.0.2-dict-iter.patch new file mode 100644 index 000000000000..fa3e545c6273 --- /dev/null +++ b/dev-python/kombu/files/kombu-4.0.2-dict-iter.patch @@ -0,0 +1,24 @@ +From 2940a4b1830bc2fc6d3f65de4feeec6ea5a49fe5 Mon Sep 17 00:00:00 2001 +From: Felix Yan +Date: Tue, 21 Feb 2017 11:52:18 -0600 +Subject: [PATCH] Don't modify dict size while iterating over it (#676) + +This fixes https://github.com/celery/kombu/issues/675. +--- + kombu/messaging.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/kombu/messaging.py b/kombu/messaging.py +index 03e7e15..e1800b5 100644 +--- a/kombu/messaging.py ++++ b/kombu/messaging.py +@@ -397,7 +397,8 @@ def revive(self, channel): + """Revive consumer after connection loss.""" + self._active_tags.clear() + channel = self.channel = maybe_channel(channel) +- for qname, queue in items(self._queues): ++ # modify dict size while iterating over it is not allowed ++ for qname, queue in list(items(self._queues)): + # name may have changed after declare + self._queues.pop(qname, None) + queue = self._queues[queue.name] = queue(self.channel) diff --git a/dev-python/kombu/files/kombu-NA-tests-fix.patch b/dev-python/kombu/files/kombu-NA-tests-fix.patch new file mode 100644 index 000000000000..a4bcda6e292d --- /dev/null +++ b/dev-python/kombu/files/kombu-NA-tests-fix.patch @@ -0,0 +1,16 @@ +https://github.com/celery/kombu/commit/828ba134105eeb4c6df52cb4441cf90c297b77e3 +Fixes NA bug with amqplib. +diff --git a/kombu/transport/amqplib.py b/kombu/transport/amqplib.py +index feedee7..f57e28c 100644 +--- a/kombu/transport/amqplib.py ++++ b/kombu/transport/amqplib.py +@@ -17,6 +17,9 @@ class SSLError(Exception): # noqa + pass + from struct import unpack + ++class NA(object): ++ pass ++ + try: + from amqplib import client_0_8 as amqp + from amqplib.client_0_8 import transport diff --git a/dev-python/kombu/kombu-3.0.37.ebuild b/dev-python/kombu/kombu-3.0.37.ebuild new file mode 100644 index 000000000000..5f608fd2bb8f --- /dev/null +++ b/dev-python/kombu/kombu-3.0.37.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy ) + +inherit distutils-r1 + +DESCRIPTION="AMQP Messaging Framework for Python" +HOMEPAGE="https://pypi.python.org/pypi/kombu https://github.com/celery/kombu" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ~arm64 x86" +IUSE="amqplib doc examples msgpack sqs test" + +# couchdb backend support possible via dev-python/couchdb-python +# ditto dev-python/kazoo(>=1.3.1) and dev-python/beanstalkc +PY27_GEN_USEDEP=$(python_gen_usedep python2_7) +PYPY_GEN_USEDEP=$(python_gen_usedep python2_7 pypy) +RDEPEND=" + >=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}] + >=dev-python/py-amqp-1.4.9[${PYTHON_USEDEP}] + =dev-python/pyzmq-13.1.0[${PYTHON_USEDEP}]' 'python*') + amqplib? ( >=dev-python/amqplib-1.0.2[${PYTHON_USEDEP}] ) + sqs? ( >=dev-python/boto-2.13.3[${PY27_GEN_USEDEP}] ) + msgpack? ( >=dev-python/msgpack-0.3.0[${PYTHON_USEDEP}] )" +# Fix to https://github.com/celery/kombu/issues/474 obliges dev-python/pymongo to >=-3.0.2 +DEPEND="${RDEPEND} + >=dev-python/setuptools-0.7[${PYTHON_USEDEP}] + test? ( + >=dev-python/unittest2-0.5.0[${PYTHON_USEDEP}] + dev-python/nose[${PYTHON_USEDEP}] + dev-python/nose-cover3[${PYTHON_USEDEP}] + >=dev-python/coverage-3.0[${PYTHON_USEDEP}] + >=dev-python/mock-0.7.0[${PYPY_GEN_USEDEP}] + dev-python/django[${PYTHON_USEDEP}] + >=dev-python/redis-py-2.10.3[${PYTHON_USEDEP}] + >=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}] + >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] ) + doc? ( + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/django[${PYTHON_USEDEP}] + dev-python/beanstalkc[${PY27_GEN_USEDEP}] + dev-python/couchdb-python[${PYTHON_USEDEP}] + >=dev-python/sphinxcontrib-issuetracker-0.9[${PYTHON_USEDEP}] )" + +# kazoo and sqlalchemy are optional packages for tests. +# Refrain for now, no established demand for it from users + +# Req'd for test phase +DISTUTILS_IN_SOURCE_BUILD=1 + +PY27_REQUSE="$(python_gen_useflags 'python2*')" +REQUIRED_USE=" + sqs? ( ${PY27_REQUSE} ) + doc? ( ${PY27_REQUSE} amqplib sqs )" # 2 deps in doc build are py2 capable only + +PATCHES=( + "${FILESDIR}"/${PN}-NA-tests-fix.patch + ) + +pkg_setup() { + use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 ) +} + +python_prepare_all() { + # https://github.com/celery/kombu/issues/246 + sed -e 's:kombu.transports:kombu.transport:' -i funtests/tests/test_django.py + distutils-r1_python_prepare_all +} + +python_compile_all() { + # Doc build must be done by py2.7 + # Doc build misses and skips only content re librabbitmq which is not in portage + if use doc; then + emake -C docs html || die "kombu docs failed installation" + fi +} + +python_test() { + export DJANGO_SETTINGS_MODULE="django.conf" + # https://github.com/celery/kombu/issues/474 + # tests need =dev-python/pymongo-3.0.2 +# if [[ "${EPYTHON}" == python2.7 ]]; then +# pushd funtests > /dev/null +# esetup.py test +# popd > /dev/null +# fi + fi +} + +python_install_all() { + use examples && local EXAMPLES=( examples/. ) + use doc && local HTML_DOCS=( docs/.build/html/. ) + distutils-r1_python_install_all +} diff --git a/dev-python/kombu/kombu-4.0.2.ebuild b/dev-python/kombu/kombu-4.0.2.ebuild new file mode 100644 index 000000000000..b5d030da5273 --- /dev/null +++ b/dev-python/kombu/kombu-4.0.2.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) + +inherit distutils-r1 + +DESCRIPTION="AMQP Messaging Framework for Python" +HOMEPAGE="https://pypi.python.org/pypi/kombu https://github.com/celery/kombu" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="doc examples msgpack sqs test" + +# couchdb backend support possible via dev-python/couchdb-python +# ditto dev-python/kazoo(>=1.3.1) +RDEPEND=" + >=dev-python/py-amqp-2.1.4[${PYTHON_USEDEP}] + dev-python/pyro:4[${PYTHON_USEDEP}] + sqs? ( >=dev-python/boto-2.13.3[${PYTHON_USEDEP}] ) + msgpack? ( >=dev-python/msgpack-0.3.0[${PYTHON_USEDEP}] )" +# Fix to https://github.com/celery/kombu/issues/474 obliges dev-python/pymongo to >=-3.0.2 +DEPEND="${RDEPEND} + >=dev-python/setuptools-0.7[${PYTHON_USEDEP}] + test? ( + >=dev-python/case-1.5.2[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytz[${PYTHON_USEDEP}] + >=dev-python/redis-py-2.10.3[${PYTHON_USEDEP}] + >=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}] + >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] ) + doc? ( + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/couchdb-python[${PYTHON_USEDEP}] + >=dev-python/sphinx_celery-1.1[${PYTHON_USEDEP}] )" + +# kazoo is optional for tests. +# Refrain for now, no established demand for it from users + +# Req'd for test phase +DISTUTILS_IN_SOURCE_BUILD=1 + +PATCHES=( + "${FILESDIR}"/${P}-dict-iter.patch + ) + +python_prepare_all() { + # AttributeError: test_Etcd instance has no attribute 'patch' + rm t/unit/transport/test_etcd.py || die + distutils-r1_python_prepare_all +} + +python_compile_all() { + # Doc build misses and skips only content re librabbitmq which is not in portage + if use doc; then + emake -C docs html || die "kombu docs failed installation" + fi +} + +python_test() { + esetup.py test +} + +python_install_all() { + if use examples; then + docompress -x "/usr/share/doc/${PF}/examples" + docinto examples + dodoc -r examples/. + fi + use doc && local HTML_DOCS=( docs/_build/html/. ) + distutils-r1_python_install_all +} diff --git a/dev-python/kombu/kombu-4.1.0.ebuild b/dev-python/kombu/kombu-4.1.0.ebuild new file mode 100644 index 000000000000..fe5302327bf7 --- /dev/null +++ b/dev-python/kombu/kombu-4.1.0.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) + +inherit distutils-r1 + +DESCRIPTION="AMQP Messaging Framework for Python" +HOMEPAGE="https://pypi.python.org/pypi/kombu https://github.com/celery/kombu" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ~arm64 x86" +IUSE="doc examples msgpack sqs test" + +# couchdb backend support possible via dev-python/couchdb-python +# ditto dev-python/kazoo(>=1.3.1) +RDEPEND=" + >=dev-python/py-amqp-2.1.4[${PYTHON_USEDEP}] + =dev-python/boto3-1.4.4[${PYTHON_USEDEP}] ) + msgpack? ( >=dev-python/msgpack-0.3.0[${PYTHON_USEDEP}] )" +# Fix to https://github.com/celery/kombu/issues/474 obliges dev-python/pymongo to >=-3.0.2 +DEPEND="${RDEPEND} + >=dev-python/setuptools-20.6.7[${PYTHON_USEDEP}] + test? ( + >=dev-python/case-1.5.2[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytz[${PYTHON_USEDEP}] + >=dev-python/redis-py-2.10.3[${PYTHON_USEDEP}] + >=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}] + >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] ) + doc? ( + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/couchdb-python[${PYTHON_USEDEP}] + >=dev-python/sphinx_celery-1.1[${PYTHON_USEDEP}] )" + +# kazoo is optional for tests. +# Refrain for now, no established demand for it from users + +# Req'd for test phase +DISTUTILS_IN_SOURCE_BUILD=1 + +PATCHES=( +) + +python_prepare_all() { + # AttributeError: test_Etcd instance has no attribute 'patch' + rm t/unit/transport/test_etcd.py || die + distutils-r1_python_prepare_all +} + +python_compile_all() { + # Doc build misses and skips only content re librabbitmq which is not in portage + if use doc; then + emake -C docs html || die "kombu docs failed installation" + fi +} + +python_test() { + esetup.py test +} + +python_install_all() { + if use examples; then + docompress -x "/usr/share/doc/${PF}/examples" + docinto examples + dodoc -r examples/. + fi + use doc && local HTML_DOCS=( docs/_build/html/. ) + distutils-r1_python_install_all +} diff --git a/dev-python/kombu/metadata.xml b/dev-python/kombu/metadata.xml new file mode 100644 index 000000000000..7c51adae3ca3 --- /dev/null +++ b/dev-python/kombu/metadata.xml @@ -0,0 +1,17 @@ + + + + + python@gentoo.org + Python + + + kombu + celery/kombu + + + Enable amqplib support + Enables Amazon SQS transport module for Kombu + Enables MessagePack (de)serializer for Python + + -- cgit v1.2.3