Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/kombu/files/, dev-python/kombu/
Date: Thu, 04 Jan 2018 21:50:54
Message-Id: 1515102636.228752b0954877a22e6d2b2017da4c1c72edf2b8.mgorny@gentoo
1 commit: 228752b0954877a22e6d2b2017da4c1c72edf2b8
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 4 21:49:25 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 4 21:50:36 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=228752b0
7
8 dev-python/kombu: Clean old up
9
10 dev-python/kombu/Manifest | 1 -
11 dev-python/kombu/files/kombu-4.0.2-dict-iter.patch | 24 -------
12 dev-python/kombu/kombu-4.0.2.ebuild | 76 ----------------------
13 3 files changed, 101 deletions(-)
14
15 diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
16 index da2cdfb4779..a69dcd6877c 100644
17 --- a/dev-python/kombu/Manifest
18 +++ b/dev-python/kombu/Manifest
19 @@ -1,3 +1,2 @@
20 DIST kombu-3.0.37.tar.gz 411790 BLAKE2B 437e99beba410bd0e42b47e91b42fb8881443c8ccba454cb092adee94a94e93cb2104259b62652c423657c58f95a9969e0e966037040cc99e996e6daa7a8e2b7 SHA512 ba9bb00e23ce2d3da87eb07aacff8d63ef9879e6ca9f3fe82653cc2ee91610199fe8fc778d7c2e00df05b46130ecda0bdeceda48192b8af1fb0eca41fbb44712
21 -DIST kombu-4.0.2.tar.gz 418051 BLAKE2B 28328692519188fa67eda545ee06f56edc681ea5bebbed73cfabf812e0b544dd8f8cb8416cc930587e3f7658bb4b2701bfb0c8eb2005b3a3a9b506e9252a424c SHA512 99be6aa833eedc02897da90ebbd838bf0ac2a21db91350e235fae99ce31607cbc749f73f99d24f76acfc68b81d6263688d35b72ed62bb21d024a3ab385fa666e
22 DIST kombu-4.1.0.tar.gz 421875 BLAKE2B 636dab025883bc9465b28e7a6ab4249ae7d079cc57d33b1af8ce8633e12b85027ace9601475f9e2db1782d197f888476ce6006a2d5429e040ee8de0d1c86266c SHA512 fc104a3f974fabf090cc257b1a7623af6048f4630c6c2a9bb693fe69d77b6cdab36135a290a41056c1f854f61cce8fc2aa6b7880e9273581bfdfa162b5724861
23
24 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
25 deleted file mode 100644
26 index fa3e545c627..00000000000
27 --- a/dev-python/kombu/files/kombu-4.0.2-dict-iter.patch
28 +++ /dev/null
29 @@ -1,24 +0,0 @@
30 -From 2940a4b1830bc2fc6d3f65de4feeec6ea5a49fe5 Mon Sep 17 00:00:00 2001
31 -From: Felix Yan <felixonmars@×××××××××.org>
32 -Date: Tue, 21 Feb 2017 11:52:18 -0600
33 -Subject: [PATCH] Don't modify dict size while iterating over it (#676)
34 -
35 -This fixes https://github.com/celery/kombu/issues/675.
36 ----
37 - kombu/messaging.py | 3 ++-
38 - 1 file changed, 2 insertions(+), 1 deletion(-)
39 -
40 -diff --git a/kombu/messaging.py b/kombu/messaging.py
41 -index 03e7e15..e1800b5 100644
42 ---- a/kombu/messaging.py
43 -+++ b/kombu/messaging.py
44 -@@ -397,7 +397,8 @@ def revive(self, channel):
45 - """Revive consumer after connection loss."""
46 - self._active_tags.clear()
47 - channel = self.channel = maybe_channel(channel)
48 -- for qname, queue in items(self._queues):
49 -+ # modify dict size while iterating over it is not allowed
50 -+ for qname, queue in list(items(self._queues)):
51 - # name may have changed after declare
52 - self._queues.pop(qname, None)
53 - queue = self._queues[queue.name] = queue(self.channel)
54
55 diff --git a/dev-python/kombu/kombu-4.0.2.ebuild b/dev-python/kombu/kombu-4.0.2.ebuild
56 deleted file mode 100644
57 index b5d030da527..00000000000
58 --- a/dev-python/kombu/kombu-4.0.2.ebuild
59 +++ /dev/null
60 @@ -1,76 +0,0 @@
61 -# Copyright 1999-2017 Gentoo Foundation
62 -# Distributed under the terms of the GNU General Public License v2
63 -
64 -EAPI=6
65 -
66 -PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
67 -
68 -inherit distutils-r1
69 -
70 -DESCRIPTION="AMQP Messaging Framework for Python"
71 -HOMEPAGE="https://pypi.python.org/pypi/kombu https://github.com/celery/kombu"
72 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
73 -
74 -LICENSE="BSD"
75 -SLOT="0"
76 -KEYWORDS="~amd64 ~arm64 ~x86"
77 -IUSE="doc examples msgpack sqs test"
78 -
79 -# couchdb backend support possible via dev-python/couchdb-python
80 -# ditto dev-python/kazoo(>=1.3.1)
81 -RDEPEND="
82 - >=dev-python/py-amqp-2.1.4[${PYTHON_USEDEP}]
83 - dev-python/pyro:4[${PYTHON_USEDEP}]
84 - sqs? ( >=dev-python/boto-2.13.3[${PYTHON_USEDEP}] )
85 - msgpack? ( >=dev-python/msgpack-0.3.0[${PYTHON_USEDEP}] )"
86 -# Fix to https://github.com/celery/kombu/issues/474 obliges dev-python/pymongo to >=-3.0.2
87 -DEPEND="${RDEPEND}
88 - >=dev-python/setuptools-0.7[${PYTHON_USEDEP}]
89 - test? (
90 - >=dev-python/case-1.5.2[${PYTHON_USEDEP}]
91 - dev-python/pytest[${PYTHON_USEDEP}]
92 - dev-python/pytz[${PYTHON_USEDEP}]
93 - >=dev-python/redis-py-2.10.3[${PYTHON_USEDEP}]
94 - >=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}]
95 - >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] )
96 - doc? (
97 - dev-python/sphinx[${PYTHON_USEDEP}]
98 - dev-python/couchdb-python[${PYTHON_USEDEP}]
99 - >=dev-python/sphinx_celery-1.1[${PYTHON_USEDEP}] )"
100 -
101 -# kazoo is optional for tests.
102 -# Refrain for now, no established demand for it from users
103 -
104 -# Req'd for test phase
105 -DISTUTILS_IN_SOURCE_BUILD=1
106 -
107 -PATCHES=(
108 - "${FILESDIR}"/${P}-dict-iter.patch
109 - )
110 -
111 -python_prepare_all() {
112 - # AttributeError: test_Etcd instance has no attribute 'patch'
113 - rm t/unit/transport/test_etcd.py || die
114 - distutils-r1_python_prepare_all
115 -}
116 -
117 -python_compile_all() {
118 - # Doc build misses and skips only content re librabbitmq which is not in portage
119 - if use doc; then
120 - emake -C docs html || die "kombu docs failed installation"
121 - fi
122 -}
123 -
124 -python_test() {
125 - esetup.py test
126 -}
127 -
128 -python_install_all() {
129 - if use examples; then
130 - docompress -x "/usr/share/doc/${PF}/examples"
131 - docinto examples
132 - dodoc -r examples/.
133 - fi
134 - use doc && local HTML_DOCS=( docs/_build/html/. )
135 - distutils-r1_python_install_all
136 -}