1 |
commit: 49dd29f47a6f6f2eedf1d9502bbad11fe0a5144c |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jun 4 06:47:26 2017 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jun 4 07:30:20 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49dd29f4 |
7 |
|
8 |
dev-python/django-celery: Drop old, bump EAPI |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
11 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
12 |
|
13 |
dev-python/django-celery/Manifest | 1 - |
14 |
.../django-celery/django-celery-3.1.16.ebuild | 60 ---------------------- |
15 |
.../django-celery/django-celery-3.1.17.ebuild | 15 +++--- |
16 |
.../django-celery-3.1.16-py3-test-failures.patch | 39 -------------- |
17 |
4 files changed, 9 insertions(+), 106 deletions(-) |
18 |
|
19 |
diff --git a/dev-python/django-celery/Manifest b/dev-python/django-celery/Manifest |
20 |
index 0ae1d789087..f7af4997ca8 100644 |
21 |
--- a/dev-python/django-celery/Manifest |
22 |
+++ b/dev-python/django-celery/Manifest |
23 |
@@ -1,2 +1 @@ |
24 |
-DIST django-celery-3.1.16.tar.gz 77411 SHA256 07a9c650a1f20e040cf5fffd0bcd920a81d0734915130d898c0325c5fafb2ec4 SHA512 8bada03237f2b6f45484fe15e985d4763944fe19b3ac7271a6b9d53058c13d903b0aba070cd813741e2a1a2c6c1d17b335f8712ca70c377d45892471ef7a59bc WHIRLPOOL a707ce0e31407e9a452d4930e93207dea31f22365a1c827dc917d9dc34d6a5c48f2bfc0aab41ce3b5a92877200265630e6fc17f7e7c80e0aac2ceb76a272a483 |
25 |
DIST django-celery-3.1.17.tar.gz 79615 SHA256 254a95b0a4386df1fd949823942f6312c80fba3c88c5efad79cad8648bc5feb5 SHA512 fa68c85ee0eea778c5921c0373f3e7547bc644cd11d83e659fdf9bf4a80e317faca12ad3941225b073609a4716c5b9574d85c5c7063cff0fdb3deb0f1b86d225 WHIRLPOOL 6f01ab8aa28723720cd2ba516c9b2ecc30c28efe69fbdc72ddb18ed0fd2cfdaede6146133ec4a59f311e223a7146a7a190eaf8d9a6d8d831e46cafe668699fff |
26 |
|
27 |
diff --git a/dev-python/django-celery/django-celery-3.1.16.ebuild b/dev-python/django-celery/django-celery-3.1.16.ebuild |
28 |
deleted file mode 100644 |
29 |
index 897bfad0778..00000000000 |
30 |
--- a/dev-python/django-celery/django-celery-3.1.16.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,60 +0,0 @@ |
33 |
-# Copyright 1999-2016 Gentoo Foundation |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=5 |
37 |
-PYTHON_COMPAT=( python{2_7,3_4} ) |
38 |
-PYTHON_REQ_USE="sqlite(+)" |
39 |
- |
40 |
-inherit distutils-r1 eutils |
41 |
- |
42 |
-DESCRIPTION="Celery Integration for Django" |
43 |
-HOMEPAGE="http://celeryproject.org/" |
44 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
45 |
- |
46 |
-LICENSE="BSD" |
47 |
-SLOT="0" |
48 |
-KEYWORDS="amd64 x86" |
49 |
-IUSE="doc examples test" |
50 |
- |
51 |
-# Python testsuite fails when built against dev-python/django-1.8.5 |
52 |
-# with ValueError: save() prohibited to prevent data loss due to |
53 |
-# unsaved related object 'interval'. |
54 |
- |
55 |
-PY2_USEDEP=$(python_gen_usedep 'python2*') |
56 |
-RDEPEND=">=dev-python/celery-3.1.15[${PYTHON_USEDEP}] |
57 |
- >dev-python/django-1.4[${PYTHON_USEDEP}] |
58 |
- <=dev-python/django-1.7.11[${PYTHON_USEDEP}] |
59 |
- dev-python/pytz[${PYTHON_USEDEP}]" |
60 |
-DEPEND="${RDEPEND} |
61 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
62 |
- test? ( |
63 |
- dev-python/django-nose[${PYTHON_USEDEP}] |
64 |
- >=dev-python/coverage-3.0[${PYTHON_USEDEP}] |
65 |
- dev-python/nose-cover3[${PYTHON_USEDEP}] |
66 |
- dev-python/mock[${PY2_USEDEP}] |
67 |
- dev-python/python-memcached[${PY2_USEDEP}] ) |
68 |
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] |
69 |
- dev-python/sphinxcontrib-issuetracker[${PY2_USEDEP}] |
70 |
- dev-python/python-memcached[${PY2_USEDEP}] |
71 |
- )" |
72 |
- |
73 |
-PY27_REQUSE="$(python_gen_useflags 'python2*')" |
74 |
-REQUIRED_USE=" |
75 |
- doc? ( ${PY27_REQUSE} )" |
76 |
- |
77 |
-PATCHES=( "${FILESDIR}/${P}-py3-test-failures.patch" ) |
78 |
- |
79 |
-python_compile_all() { |
80 |
- use doc && emake -C docs html |
81 |
-} |
82 |
- |
83 |
-python_test() { |
84 |
- # https://github.com/celery/django-celery/issues/342 |
85 |
- "${PYTHON}" tests/manage.py test |
86 |
-} |
87 |
- |
88 |
-python_install_all() { |
89 |
- use doc && local HTML_DOCS=( docs/.build/html/. ) |
90 |
- use examples && local EXAMPLES=( examples/. ) |
91 |
- distutils-r1_python_install_all |
92 |
-} |
93 |
|
94 |
diff --git a/dev-python/django-celery/django-celery-3.1.17.ebuild b/dev-python/django-celery/django-celery-3.1.17.ebuild |
95 |
index 3f4179fc30d..3092cb13fc8 100644 |
96 |
--- a/dev-python/django-celery/django-celery-3.1.17.ebuild |
97 |
+++ b/dev-python/django-celery/django-celery-3.1.17.ebuild |
98 |
@@ -1,8 +1,9 @@ |
99 |
-# Copyright 1999-2015 Gentoo Foundation |
100 |
+# Copyright 1999-2017 Gentoo Foundation |
101 |
# Distributed under the terms of the GNU General Public License v2 |
102 |
|
103 |
-EAPI=5 |
104 |
-PYTHON_COMPAT=( python{2_7,3_4} ) |
105 |
+EAPI=6 |
106 |
+ |
107 |
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) |
108 |
PYTHON_REQ_USE="sqlite(+)" |
109 |
|
110 |
inherit distutils-r1 eutils |
111 |
@@ -20,7 +21,8 @@ IUSE="doc examples test" |
112 |
# with ValueError: save() prohibited to prevent data loss due to |
113 |
# unsaved related object 'interval'. |
114 |
|
115 |
-RDEPEND=">=dev-python/celery-3.1.15[${PYTHON_USEDEP}] |
116 |
+RDEPEND=" |
117 |
+ >=dev-python/celery-3.1.15[${PYTHON_USEDEP}] |
118 |
>dev-python/django-1.4[${PYTHON_USEDEP}] |
119 |
<dev-python/django-1.9[${PYTHON_USEDEP}] |
120 |
dev-python/pytz[${PYTHON_USEDEP}]" |
121 |
@@ -32,7 +34,8 @@ DEPEND="${RDEPEND} |
122 |
dev-python/nose-cover3[${PYTHON_USEDEP}] |
123 |
dev-python/mock[${PYTHON_USEDEP}] |
124 |
dev-python/python-memcached[${PYTHON_USEDEP}] ) |
125 |
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] |
126 |
+ doc? ( |
127 |
+ dev-python/sphinx[${PYTHON_USEDEP}] |
128 |
dev-python/sphinxcontrib-issuetracker[${PYTHON_USEDEP}] |
129 |
dev-python/python-memcached[${PYTHON_USEDEP}] |
130 |
)" |
131 |
@@ -43,7 +46,7 @@ python_compile_all() { |
132 |
|
133 |
python_test() { |
134 |
# https://github.com/celery/django-celery/issues/342 |
135 |
- "${PYTHON}" tests/manage.py test |
136 |
+ "${PYTHON}" tests/manage.py test || die |
137 |
} |
138 |
|
139 |
python_install_all() { |
140 |
|
141 |
diff --git a/dev-python/django-celery/files/django-celery-3.1.16-py3-test-failures.patch b/dev-python/django-celery/files/django-celery-3.1.16-py3-test-failures.patch |
142 |
deleted file mode 100644 |
143 |
index 4b44b664c02..00000000000 |
144 |
--- a/dev-python/django-celery/files/django-celery-3.1.16-py3-test-failures.patch |
145 |
+++ /dev/null |
146 |
@@ -1,39 +0,0 @@ |
147 |
-https://github.com/brianmay/django-celery/commit/8c4449f2a1b65f16eb405ecb3a2ef98ea7a8bf4f |
148 |
-diff --git a/djcelery/loaders.py b/djcelery/loaders.py |
149 |
-index c86455a..61c6d04 100644 |
150 |
---- a/djcelery/loaders.py |
151 |
-+++ b/djcelery/loaders.py |
152 |
-# Patch to fix failing tests test_list_registered_tasks and |
153 |
-# test_apply with python3. Patch sourced from upstream |
154 |
-# https://github.com/celery/django-celery/issues/342 |
155 |
-@@ -201,7 +201,8 @@ def find_related_module(app, related_name): |
156 |
- return |
157 |
- |
158 |
- try: |
159 |
-- imp.find_module(related_name, app_path) |
160 |
-+ file, _, _ = imp.find_module(related_name, app_path) |
161 |
-+ file.close() |
162 |
- except ImportError: |
163 |
- return |
164 |
- |
165 |
-diff --git a/djcelery/views.py b/djcelery/views.py |
166 |
-index 34cb307..4d07e0a 100644 |
167 |
---- a/djcelery/views.py |
168 |
-+++ b/djcelery/views.py |
169 |
-@@ -34,7 +34,7 @@ def task_view(task): |
170 |
- kwargs = kwdict(request.method == 'POST' and |
171 |
- request.POST or request.GET) |
172 |
- # no multivalue |
173 |
-- kwargs = dict(((k, v) for k, v in kwargs.iteritems()), **options) |
174 |
-+ kwargs = dict(((k, v) for k, v in kwargs.items()), **options) |
175 |
- result = task.apply_async(kwargs=kwargs) |
176 |
- return JsonResponse({'ok': 'true', 'task_id': result.task_id}) |
177 |
- |
178 |
-@@ -78,8 +78,8 @@ def task_status(request, task_id): |
179 |
- |
180 |
- def registered_tasks(request): |
181 |
- """View returning all defined tasks as a JSON object.""" |
182 |
-- return JsonResponse({'regular': tasks.regular().keys(), |
183 |
-- 'periodic': tasks.periodic().keys()}) |
184 |
-+ return JsonResponse({'regular': list(tasks.regular().keys()), |
185 |
-+ 'periodic': list(tasks.periodic().keys())}) |