Gentoo Archives: gentoo-commits

From: Matt Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/kombu/
Date: Sat, 01 Sep 2018 05:30:40
Message-Id: 1535779823.48f6e882d4fbbdee69fd4c8f0dba54e4b7533a9e.prometheanfire@gentoo
1 commit: 48f6e882d4fbbdee69fd4c8f0dba54e4b7533a9e
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 1 05:27:28 2018 +0000
4 Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 1 05:30:23 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48f6e882
7
8 dev-python/kombu: cleanup
9
10 Package-Manager: Portage-2.3.48, Repoman-2.3.10
11
12 dev-python/kombu/Manifest | 1 -
13 dev-python/kombu/kombu-3.0.37-r1.ebuild | 112 --------------------------------
14 dev-python/kombu/metadata.xml | 1 -
15 3 files changed, 114 deletions(-)
16
17 diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
18 index a69dcd6877c..a7d0a649e57 100644
19 --- a/dev-python/kombu/Manifest
20 +++ b/dev-python/kombu/Manifest
21 @@ -1,2 +1 @@
22 -DIST kombu-3.0.37.tar.gz 411790 BLAKE2B 437e99beba410bd0e42b47e91b42fb8881443c8ccba454cb092adee94a94e93cb2104259b62652c423657c58f95a9969e0e966037040cc99e996e6daa7a8e2b7 SHA512 ba9bb00e23ce2d3da87eb07aacff8d63ef9879e6ca9f3fe82653cc2ee91610199fe8fc778d7c2e00df05b46130ecda0bdeceda48192b8af1fb0eca41fbb44712
23 DIST kombu-4.1.0.tar.gz 421875 BLAKE2B 636dab025883bc9465b28e7a6ab4249ae7d079cc57d33b1af8ce8633e12b85027ace9601475f9e2db1782d197f888476ce6006a2d5429e040ee8de0d1c86266c SHA512 fc104a3f974fabf090cc257b1a7623af6048f4630c6c2a9bb693fe69d77b6cdab36135a290a41056c1f854f61cce8fc2aa6b7880e9273581bfdfa162b5724861
24
25 diff --git a/dev-python/kombu/kombu-3.0.37-r1.ebuild b/dev-python/kombu/kombu-3.0.37-r1.ebuild
26 deleted file mode 100644
27 index b562ae57521..00000000000
28 --- a/dev-python/kombu/kombu-3.0.37-r1.ebuild
29 +++ /dev/null
30 @@ -1,112 +0,0 @@
31 -# Copyright 1999-2018 Gentoo Foundation
32 -# Distributed under the terms of the GNU General Public License v2
33 -
34 -EAPI=5
35 -
36 -PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
37 -
38 -inherit distutils-r1
39 -
40 -DESCRIPTION="AMQP Messaging Framework for Python"
41 -HOMEPAGE="https://pypi.org/project/kombu/ https://github.com/celery/kombu"
42 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
43 -
44 -LICENSE="BSD"
45 -SLOT="0"
46 -KEYWORDS="amd64 ~arm64 x86"
47 -IUSE="amqplib doc examples msgpack sqs test"
48 -
49 -# couchdb backend support possible via dev-python/couchdb-python
50 -# ditto dev-python/kazoo(>=1.3.1) and dev-python/beanstalkc
51 -PY27_GEN_USEDEP=$(python_gen_usedep python2_7)
52 -PYPY_GEN_USEDEP=$(python_gen_usedep python2_7 pypy)
53 -RDEPEND="
54 - >=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
55 - >=dev-python/py-amqp-1.4.9[${PYTHON_USEDEP}]
56 - <dev-python/py-amqp-2.0[${PYTHON_USEDEP}]
57 - dev-python/pyro:4[${PYTHON_USEDEP}]
58 - $(python_gen_cond_dep '>=dev-python/pyzmq-13.1.0[${PYTHON_USEDEP}]' 'python*')
59 - amqplib? ( >=dev-python/amqplib-1.0.2[${PYTHON_USEDEP}] )
60 - sqs? ( >=dev-python/boto-2.13.3[${PY27_GEN_USEDEP}] )
61 - msgpack? ( >=dev-python/msgpack-0.3.0[${PYTHON_USEDEP}] )"
62 -# Fix to https://github.com/celery/kombu/issues/474 obliges dev-python/pymongo to >=-3.0.2
63 -DEPEND="${RDEPEND}
64 - >=dev-python/setuptools-0.7[${PYTHON_USEDEP}]
65 - test? (
66 - >=dev-python/unittest2-0.5.0[${PYTHON_USEDEP}]
67 - dev-python/nose[${PYTHON_USEDEP}]
68 - dev-python/nose-cover3[${PYTHON_USEDEP}]
69 - >=dev-python/coverage-3.0[${PYTHON_USEDEP}]
70 - >=dev-python/mock-0.7.0[${PYPY_GEN_USEDEP}]
71 - dev-python/django[${PYTHON_USEDEP}]
72 - >=dev-python/redis-py-2.10.3[${PYTHON_USEDEP}]
73 - >=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}]
74 - >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] )
75 - doc? (
76 - dev-python/sphinx[${PYTHON_USEDEP}]
77 - dev-python/django[${PYTHON_USEDEP}]
78 - dev-python/beanstalkc[${PY27_GEN_USEDEP}]
79 - dev-python/couchdb-python[${PYTHON_USEDEP}]
80 - >=dev-python/sphinxcontrib-issuetracker-0.9[${PYTHON_USEDEP}] )"
81 -
82 -# kazoo and sqlalchemy are optional packages for tests.
83 -# Refrain for now, no established demand for it from users
84 -
85 -# Req'd for test phase
86 -DISTUTILS_IN_SOURCE_BUILD=1
87 -
88 -PY27_REQUSE="$(python_gen_useflags 'python2*')"
89 -REQUIRED_USE="
90 - sqs? ( ${PY27_REQUSE} )
91 - doc? ( ${PY27_REQUSE} amqplib sqs )" # 2 deps in doc build are py2 capable only
92 -
93 -PATCHES=(
94 - "${FILESDIR}"/${PN}-NA-tests-fix.patch
95 - )
96 -
97 -pkg_setup() {
98 - use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
99 -}
100 -
101 -python_prepare_all() {
102 - # https://github.com/celery/kombu/issues/246
103 - sed -e 's:kombu.transports:kombu.transport:' -i funtests/tests/test_django.py
104 - # allow use of new (renamed) msgpack
105 - sed -i '/msgpack/d' requirements/extras/msgpack.txt || die
106 - distutils-r1_python_prepare_all
107 -}
108 -
109 -python_compile_all() {
110 - # Doc build must be done by py2.7
111 - # Doc build misses and skips only content re librabbitmq which is not in portage
112 - if use doc; then
113 - emake -C docs html || die "kombu docs failed installation"
114 - fi
115 -}
116 -
117 -python_test() {
118 - export DJANGO_SETTINGS_MODULE="django.conf"
119 - # https://github.com/celery/kombu/issues/474
120 - # tests need </pymongo-3.0; known to cause some breakage
121 - if python_is_python3; then
122 - 2to3 --no-diffs -w build/lib/kombu/transport/
123 - nosetests --py3where=build/lib kombu/tests || die "Tests failed under ${EPYTHON}"
124 - else
125 - nosetests "${S}"/kombu/tests || die "Tests failed under ${EPYTHON}"
126 - # funtests appears to be coded only for py2, a kind of 2nd tier. pypy fails 6.
127 - # https://github.com/celery/kombu/issues/411
128 - # Fix to https://github.com/celery/kombu/issues/474 breaks the
129 - # funtests under >=dev-python/pymongo-3.0.2
130 -# if [[ "${EPYTHON}" == python2.7 ]]; then
131 -# pushd funtests > /dev/null
132 -# esetup.py test
133 -# popd > /dev/null
134 -# fi
135 - fi
136 -}
137 -
138 -python_install_all() {
139 - use examples && local EXAMPLES=( examples/. )
140 - use doc && local HTML_DOCS=( docs/.build/html/. )
141 - distutils-r1_python_install_all
142 -}
143
144 diff --git a/dev-python/kombu/metadata.xml b/dev-python/kombu/metadata.xml
145 index b487c812a55..9379c4a1d89 100644
146 --- a/dev-python/kombu/metadata.xml
147 +++ b/dev-python/kombu/metadata.xml
148 @@ -10,7 +10,6 @@
149 <remote-id type="github">celery/kombu</remote-id>
150 </upstream>
151 <use>
152 - <flag name="amqplib">Enable amqplib support</flag>
153 <flag name="sqs">Enables Amazon SQS transport module for Kombu</flag>
154 <flag name="mongodb">Enables MongoDB backend</flag>
155 <flag name="msgpack">Enables MessagePack (de)serializer for Python</flag>