Gentoo Archives: gentoo-commits

From: "Ian Delaney (idella4)" <idella4@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-python/django: django-1.6.4.ebuild django-1.5.7.ebuild django-1.4.12.ebuild django-1.4.11.ebuild ChangeLog
Date: Sat, 03 May 2014 01:57:52
Message-Id: 20140503015747.67F602004C@flycatcher.gentoo.org
1 idella4 14/05/03 01:57:47
2
3 Modified: django-1.4.11.ebuild ChangeLog
4 Added: django-1.6.4.ebuild django-1.5.7.ebuild
5 django-1.4.12.ebuild
6 Log:
7 bumps; clean up PYTHON_COMPAT from old implementations
8
9 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)
10
11 Revision Changes Path
12 1.4 dev-python/django/django-1.4.11.ebuild
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-1.4.11.ebuild?rev=1.4&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-1.4.11.ebuild?rev=1.4&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-1.4.11.ebuild?r1=1.3&r2=1.4
17
18 Index: django-1.4.11.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/dev-python/django/django-1.4.11.ebuild,v
21 retrieving revision 1.3
22 retrieving revision 1.4
23 diff -u -r1.3 -r1.4
24 --- django-1.4.11.ebuild 27 Apr 2014 09:09:03 -0000 1.3
25 +++ django-1.4.11.ebuild 3 May 2014 01:57:47 -0000 1.4
26 @@ -1,10 +1,10 @@
27 # Copyright 1999-2014 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.4.11.ebuild,v 1.3 2014/04/27 09:09:03 ago Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.4.11.ebuild,v 1.4 2014/05/03 01:57:47 idella4 Exp $
31
32 EAPI=5
33
34 -PYTHON_COMPAT=( python{2_5,2_6,2_7} )
35 +PYTHON_COMPAT=( python2_7 )
36 PYTHON_REQ_USE='sqlite?'
37
38 inherit bash-completion-r1 distutils-r1 versionator webapp
39
40
41
42 1.129 dev-python/django/ChangeLog
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/ChangeLog?rev=1.129&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/ChangeLog?rev=1.129&content-type=text/plain
46 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/ChangeLog?r1=1.128&r2=1.129
47
48 Index: ChangeLog
49 ===================================================================
50 RCS file: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v
51 retrieving revision 1.128
52 retrieving revision 1.129
53 diff -u -r1.128 -r1.129
54 --- ChangeLog 2 May 2014 11:49:29 -0000 1.128
55 +++ ChangeLog 3 May 2014 01:57:47 -0000 1.129
56 @@ -1,6 +1,14 @@
57 # ChangeLog for dev-python/django
58 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
59 -# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.128 2014/05/02 11:49:29 idella4 Exp $
60 +# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.129 2014/05/03 01:57:47 idella4 Exp $
61 +
62 +*django-1.5.7 (03 May 2014)
63 +*django-1.6.4 (03 May 2014)
64 +*django-1.4.12 (03 May 2014)
65 +
66 + 03 May 2014; Ian Delaney <idella4@g.o> +django-1.4.12.ebuild,
67 + +django-1.5.7.ebuild, +django-1.6.4.ebuild, django-1.4.11.ebuild:
68 + bumps; clean up PYTHON_COMPAT from old implementations
69
70 02 May 2014; Ian Delaney <idella4@g.o> -django-1.5.4.ebuild,
71 -django-1.6.1.ebuild:
72
73
74
75 1.1 dev-python/django/django-1.6.4.ebuild
76
77 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-1.6.4.ebuild?rev=1.1&view=markup
78 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-1.6.4.ebuild?rev=1.1&content-type=text/plain
79
80 Index: django-1.6.4.ebuild
81 ===================================================================
82 # Copyright 1999-2014 Gentoo Foundation
83 # Distributed under the terms of the GNU General Public License v2
84 # $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.6.4.ebuild,v 1.1 2014/05/03 01:57:47 idella4 Exp $
85
86 EAPI=5
87 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
88 PYTHON_REQ_USE='sqlite?'
89 WEBAPP_NO_AUTO_INSTALL="yes"
90
91 inherit bash-completion-r1 distutils-r1 versionator webapp
92
93 MY_P="Django-${PV}"
94
95 DESCRIPTION="High-level Python web framework"
96 HOMEPAGE="http://www.djangoproject.com/ http://pypi.python.org/pypi/Django"
97 SRC_URI="https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
98
99 LICENSE="BSD"
100 SLOT="0"
101 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
102 IUSE="doc mysql postgres sqlite test"
103
104 PY2_USEDEP=$(python_gen_usedep 'python2*')
105 RDEPEND="virtual/python-imaging[${PYTHON_USEDEP}]
106 postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
107 mysql? ( >=dev-python/mysql-python-1.2.3[${PY2_USEDEP}] )"
108 DEPEND="${RDEPEND}
109 doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
110 test? ( ${PYTHON_DEPS//sqlite?/sqlite} )"
111
112 REQUIRED_USE="mysql? ( || ( $(python_gen_useflags 'python2*') ) )"
113
114 S="${WORKDIR}/${MY_P}"
115
116 WEBAPP_MANUAL_SLOT="yes"
117
118 PATCHES=( "${FILESDIR}"/${PN}-1.5-py3tests.patch \
119 "${FILESDIR}"/${PN}-1.6-objects.patch )
120
121 python_prepare_all() {
122 # Avoid test failures with unittest2 and Python 3.
123 sed -e "s/from unittest2 import \*/raise ImportError/" -i django/utils/unittest/__init__.py
124 distutils-r1_python_prepare_all
125 }
126
127 python_compile_all() {
128 if use doc; then
129 emake -C docs html
130 fi
131 }
132
133 python_test() {
134 # Tests have non-standard assumptions about PYTHONPATH,
135 # and don't work with ${BUILD_DIR}/lib.
136 # https://code.djangoproject.com/ticket/20514
137 # https://code.djangoproject.com/ticket/21093
138 # export PYTHONWARNINGS="d,i::ImportWarning"
139 sed -e 's:test_dont_base64_encode:_&:' -i tests/mail/tests.py || die
140 PYTHONPATH=. \
141 "${PYTHON}" tests/runtests.py --settings=test_sqlite -v1 \
142 || die "Tests fail with ${EPYTHON}"
143 }
144
145 src_test() {
146 # Port conflict in django.test.testcases.LiveServerTestCase.
147 # Several other races with temp files.
148 DISTUTILS_NO_PARALLEL_BUILD=1 distutils-r1_src_test
149 }
150
151 src_install() {
152 distutils-r1_src_install
153 webapp_src_install
154 }
155
156 python_install_all() {
157 newbashcomp extras/django_bash_completion ${PN}
158
159 if use doc; then
160 rm -fr docs/_build/html/_sources
161 local HTML_DOCS=( docs/_build/html/. )
162 fi
163
164 insinto "${MY_HTDOCSDIR#${EPREFIX}}"
165 doins -r django/contrib/admin/static/admin/.
166 distutils-r1_python_install_all
167 }
168
169 pkg_postinst() {
170 elog "A copy of the admin media is available to webapp-config for installation in a"
171 elog "webroot, as well as the traditional location in python's site-packages dir"
172 elog "for easy development."
173 webapp_pkg_postinst
174 }
175
176
177
178 1.1 dev-python/django/django-1.5.7.ebuild
179
180 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-1.5.7.ebuild?rev=1.1&view=markup
181 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-1.5.7.ebuild?rev=1.1&content-type=text/plain
182
183 Index: django-1.5.7.ebuild
184 ===================================================================
185 # Copyright 1999-2014 Gentoo Foundation
186 # Distributed under the terms of the GNU General Public License v2
187 # $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.5.7.ebuild,v 1.1 2014/05/03 01:57:47 idella4 Exp $
188
189 EAPI=5
190 PYTHON_COMPAT=( python{2_7,3_2,3_3} )
191 PYTHON_REQ_USE='sqlite?'
192 WEBAPP_NO_AUTO_INSTALL="yes"
193
194 inherit bash-completion-r1 distutils-r1 versionator webapp
195
196 MY_P="Django-${PV}"
197
198 DESCRIPTION="High-level Python web framework"
199 HOMEPAGE="http://www.djangoproject.com/ http://pypi.python.org/pypi/Django"
200 SRC_URI="https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
201
202 LICENSE="BSD"
203 SLOT="0"
204 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
205 IUSE="doc mysql postgres sqlite test"
206
207 PY2_USEDEP=$(python_gen_usedep 'python2*')
208 RDEPEND="virtual/python-imaging[${PYTHON_USEDEP}]
209 postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
210 mysql? ( >=dev-python/mysql-python-1.2.3[${PY2_USEDEP}] )"
211 DEPEND="${RDEPEND}
212 doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
213 test? ( ${PYTHON_DEPS//sqlite?/sqlite} )"
214
215 REQUIRED_USE="mysql? ( || ( $(python_gen_useflags 'python2*') ) )"
216
217 S="${WORKDIR}/${MY_P}"
218
219 WEBAPP_MANUAL_SLOT="yes"
220
221 PATCHES=( "${FILESDIR}"/${PN}-1.5.4-objects.patch \
222 "${FILESDIR}"/${PN}-1.5-py3tests.patch )
223
224 python_compile_all() {
225 if use doc; then
226 emake -C docs html
227 fi
228 }
229
230 python_test() {
231 # Tests have non-standard assumptions about PYTHONPATH,
232 # and don't work with ${BUILD_DIR}/lib.
233 # https://code.djangoproject.com/ticket/20514
234 PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v1 \
235 || die "Tests fail with ${EPYTHON}"
236 }
237
238 src_test() {
239 # Port conflict in django.test.testcases.LiveServerTestCase.
240 # Several other races with temp files.
241 DISTUTILS_NO_PARALLEL_BUILD=1 distutils-r1_src_test
242 }
243
244 src_install() {
245 distutils-r1_src_install
246 webapp_src_install
247 }
248
249 python_install_all() {
250 newbashcomp extras/django_bash_completion ${PN}
251
252 if use doc; then
253 rm -fr docs/_build/html/_sources
254 local HTML_DOCS=( docs/_build/html/. )
255 fi
256
257 insinto "${MY_HTDOCSDIR#${EPREFIX}}"
258 doins -r django/contrib/admin/static/admin/.
259 distutils-r1_python_install_all
260 }
261
262 pkg_postinst() {
263 elog "A copy of the admin media is available to webapp-config for installation in a"
264 elog "webroot, as well as the traditional location in python's site-packages dir"
265 elog "for easy development."
266 webapp_pkg_postinst
267 }
268
269
270
271 1.1 dev-python/django/django-1.4.12.ebuild
272
273 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-1.4.12.ebuild?rev=1.1&view=markup
274 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-1.4.12.ebuild?rev=1.1&content-type=text/plain
275
276 Index: django-1.4.12.ebuild
277 ===================================================================
278 # Copyright 1999-2014 Gentoo Foundation
279 # Distributed under the terms of the GNU General Public License v2
280 # $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.4.12.ebuild,v 1.1 2014/05/03 01:57:47 idella4 Exp $
281
282 EAPI=5
283
284 PYTHON_COMPAT=( python2_7 )
285 PYTHON_REQ_USE='sqlite?'
286
287 inherit bash-completion-r1 distutils-r1 versionator webapp
288
289 MY_P="Django-${PV}"
290
291 DESCRIPTION="High-level Python web framework"
292 HOMEPAGE="http://www.djangoproject.com/ http://pypi.python.org/pypi/Django"
293 SRC_URI="https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
294
295 LICENSE="BSD"
296 SLOT="0"
297 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
298 IUSE="mysql postgres sqlite test"
299
300 RDEPEND="virtual/python-imaging[${PYTHON_USEDEP}]
301 postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
302 mysql? ( >=dev-python/mysql-python-1.2.3[${PYTHON_USEDEP}] )"
303 DEPEND="${RDEPEND}
304 test? ( ${PYTHON_DEPS//sqlite?/sqlite} )"
305
306 S="${WORKDIR}/${MY_P}"
307
308 WEBAPP_MANUAL_SLOT="yes"
309
310 python_prepare_all() {
311 # Disable tests requiring network connection.
312 sed \
313 -e "s/test_correct_url_value_passes/_&/" \
314 -e "s/test_correct_url_with_redirect/_&/" \
315 -i tests/modeltests/validation/tests.py || die
316 sed \
317 -e "s/test_urlfield_3/_&/" \
318 -e "s/test_urlfield_4/_&/" \
319 -e "s/test_urlfield_10/_&/" \
320 -i tests/regressiontests/forms/tests/fields.py || die
321
322 distutils-r1_python_prepare_all
323 }
324
325 python_test() {
326 # Tests have non-standard assumptions about PYTHONPATH,
327 # and don't work with ${BUILD_DIR}/lib.
328 PYTHONPATH=. \
329 "${PYTHON}" tests/runtests.py --settings=test_sqlite -v1 \
330 || die "Tests fail with ${EPYTHON}"
331 }
332
333 src_test() {
334 # Port conflict in django.test.testcases.LiveServerTestCase.
335 # Several other races with temp files.
336 DISTUTILS_NO_PARALLEL_BUILD=1 distutils-r1_src_test
337 }
338
339 src_install() {
340 distutils-r1_src_install
341 webapp_src_install
342 }
343
344 python_install_all() {
345 distutils-r1_python_install_all
346
347 newbashcomp extras/django_bash_completion ${PN}
348
349 insinto "${MY_HTDOCSDIR#${EPREFIX}}"
350 doins -r django/contrib/admin/static/admin/.
351 }
352
353 pkg_postinst() {
354 elog "A copy of the admin media is available to"
355 elog "webapp-config for installation in a webroot,"
356 elog "as well as the traditional location in python's"
357 elog "site-packages dir for easy development"
358 elog
359 ewarn "If you build Django ${PV} without USE=\"vhosts\""
360
361 # XXX: call webapp_pkg_postinst? the old ebuild didn't do that...
362 ewarn "webapp-config will automatically install the"
363 ewarn "admin media into the localhost webroot."
364 }