Gentoo Archives: gentoo-commits

From: "Kacper Kowalik (xarthisius)" <xarthisius@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-python/django: django-1.4.1.ebuild django-1.3.2.ebuild ChangeLog
Date: Tue, 31 Jul 2012 12:02:11
Message-Id: 20120731120155.3A7522004B@flycatcher.gentoo.org
1 xarthisius 12/07/31 12:01:53
2
3 Modified: ChangeLog
4 Added: django-1.4.1.ebuild django-1.3.2.ebuild
5 Log:
6 Version bump wrt #428780 by Agostino Sarubbo <ago@g.o>. Thanks to Xelnor for the report on irc and testing
7
8 (Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.81 dev-python/django/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/ChangeLog?rev=1.81&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/ChangeLog?rev=1.81&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/ChangeLog?r1=1.80&r2=1.81
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v
20 retrieving revision 1.80
21 retrieving revision 1.81
22 diff -u -r1.80 -r1.81
23 --- ChangeLog 28 May 2012 19:38:23 -0000 1.80
24 +++ ChangeLog 31 Jul 2012 12:01:53 -0000 1.81
25 @@ -1,6 +1,14 @@
26 # ChangeLog for dev-python/django
27 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.80 2012/05/28 19:38:23 xarthisius Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.81 2012/07/31 12:01:53 xarthisius Exp $
30 +
31 +*django-1.4.1 (31 Jul 2012)
32 +*django-1.3.2 (31 Jul 2012)
33 +
34 + 31 Jul 2012; Kacper Kowalik <xarthisius@g.o> +django-1.3.2.ebuild,
35 + +django-1.4.1.ebuild:
36 + Version bump wrt #428780 by Agostino Sarubbo <ago@g.o>. Thanks to
37 + Xelnor for the report on irc and testing
38
39 28 May 2012; Kacper Kowalik <xarthisius@g.o> django-1.1.4.ebuild,
40 django-1.2.5.ebuild, django-1.3.1.ebuild, django-1.3.ebuild,
41 @@ -357,4 +365,3 @@
42 28 Mar 2006; Lukasz Strzygowski <lucass@g.o> +metadata.xml,
43 +django-0.91.ebuild:
44 Initial commit (bug #114821).
45 -
46
47
48
49 1.1 dev-python/django/django-1.4.1.ebuild
50
51 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-1.4.1.ebuild?rev=1.1&view=markup
52 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-1.4.1.ebuild?rev=1.1&content-type=text/plain
53
54 Index: django-1.4.1.ebuild
55 ===================================================================
56 # Copyright 1999-2012 Gentoo Foundation
57 # Distributed under the terms of the GNU General Public License v2
58 # $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.4.1.ebuild,v 1.1 2012/07/31 12:01:53 xarthisius Exp $
59
60 EAPI="3"
61 PYTHON_DEPEND="2"
62 SUPPORT_PYTHON_ABIS="1"
63 RESTRICT_PYTHON_ABIS="3.*"
64
65 inherit bash-completion-r1 distutils versionator webapp
66
67 MY_P="Django-${PV}"
68
69 DESCRIPTION="High-level Python web framework"
70 HOMEPAGE="http://www.djangoproject.com/ http://pypi.python.org/pypi/Django"
71 SRC_URI="https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
72
73 LICENSE="BSD"
74 SLOT="0"
75 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
76 IUSE="doc mysql postgres sqlite test"
77
78 RDEPEND="dev-python/imaging
79 sqlite? ( || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 ) )
80 postgres? ( dev-python/psycopg:2 )
81 mysql? ( >=dev-python/mysql-python-1.2.1_p2 )"
82 DEPEND="${RDEPEND}
83 doc? ( >=dev-python/sphinx-0.3 )
84 test? ( || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 ) )"
85
86 S="${WORKDIR}/${MY_P}"
87
88 WEBAPP_MANUAL_SLOT="yes"
89
90 pkg_setup() {
91 python_pkg_setup
92 webapp_pkg_setup
93 }
94
95 src_prepare() {
96 distutils_src_prepare
97
98 # Disable tests requiring network connection.
99 sed \
100 -e "s/test_correct_url_value_passes/_&/" \
101 -e "s/test_correct_url_with_redirect/_&/" \
102 -i tests/modeltests/validation/tests.py
103 sed \
104 -e "s/test_urlfield_3/_&/" \
105 -e "s/test_urlfield_4/_&/" \
106 -e "s/test_urlfield_10/_&/" \
107 -i tests/regressiontests/forms/tests/fields.py
108 }
109
110 src_compile() {
111 distutils_src_compile
112
113 if use doc; then
114 einfo "Generation of documentation"
115 pushd docs > /dev/null
116 emake html || die "Generation of documentation failed"
117 popd > /dev/null
118 fi
119 }
120
121 src_test() {
122 testing() {
123 # Tests have non-standard assumptions about PYTHONPATH and
124 # don't work with usual "build-${PYTHON_ABI}/lib".
125 PYTHONPATH="." "$(PYTHON)" tests/runtests.py --settings=test_sqlite -v1
126 }
127 python_execute_function testing
128 }
129
130 src_install() {
131 distutils_src_install
132
133 newbashcomp extras/django_bash_completion ${PN} || die
134
135 if use doc; then
136 rm -fr docs/_build/html/_sources
137 dohtml -A txt -r docs/_build/html/* || die "dohtml failed"
138 fi
139
140 insinto "${MY_HTDOCSDIR#${EPREFIX}}"
141 doins -r django/contrib/admin/static/admin/* || die "doins failed"
142
143 webapp_src_install
144 }
145
146 pkg_preinst() {
147 :
148 }
149
150 pkg_postinst() {
151 distutils_pkg_postinst
152
153 einfo "Now, Django has the best of both worlds with Gentoo,"
154 einfo "ease of deployment for production and development."
155 echo
156 elog "A copy of the admin media is available to"
157 elog "webapp-config for installation in a webroot,"
158 elog "as well as the traditional location in python's"
159 elog "site-packages dir for easy development"
160 echo
161 ewarn "If you build Django ${PV} without USE=\"vhosts\""
162 ewarn "webapp-config will automatically install the"
163 ewarn "admin media into the localhost webroot."
164 }
165
166
167
168 1.1 dev-python/django/django-1.3.2.ebuild
169
170 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-1.3.2.ebuild?rev=1.1&view=markup
171 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-1.3.2.ebuild?rev=1.1&content-type=text/plain
172
173 Index: django-1.3.2.ebuild
174 ===================================================================
175 # Copyright 1999-2012 Gentoo Foundation
176 # Distributed under the terms of the GNU General Public License v2
177 # $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.3.2.ebuild,v 1.1 2012/07/31 12:01:53 xarthisius Exp $
178
179 EAPI="3"
180 PYTHON_DEPEND="2"
181 SUPPORT_PYTHON_ABIS="1"
182 RESTRICT_PYTHON_ABIS="3.*"
183
184 inherit bash-completion-r1 distutils eutils versionator webapp
185
186 MY_P="Django-${PV}"
187
188 DESCRIPTION="High-level Python web framework"
189 HOMEPAGE="http://www.djangoproject.com/ http://pypi.python.org/pypi/Django"
190 SRC_URI="https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
191
192 LICENSE="BSD"
193 SLOT="0"
194 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
195 IUSE="doc mysql postgres sqlite test"
196
197 RDEPEND="dev-python/imaging
198 sqlite? ( || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 ) )
199 postgres? ( dev-python/psycopg )
200 mysql? ( >=dev-python/mysql-python-1.2.1_p2 )"
201 DEPEND="${RDEPEND}
202 doc? ( >=dev-python/sphinx-0.3 )
203 test? ( || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 ) )"
204
205 S="${WORKDIR}/${MY_P}"
206
207 DOCS="docs/README AUTHORS"
208 WEBAPP_MANUAL_SLOT="yes"
209
210 pkg_setup() {
211 python_pkg_setup
212 webapp_pkg_setup
213 }
214
215 src_prepare() {
216 distutils_src_prepare
217 epatch "${FILESDIR}/${PN}-1.3.1-djangodocs_extension.patch"
218
219 # Disable tests requiring network connection.
220 sed \
221 -e "s/test_correct_url_value_passes/_&/" \
222 -e "s/test_correct_url_with_redirect/_&/" \
223 -i tests/modeltests/validation/tests.py
224 sed \
225 -e "s/test_urlfield_3/_&/" \
226 -e "s/test_urlfield_4/_&/" \
227 -e "s/test_urlfield_10/_&/" \
228 -i tests/regressiontests/forms/tests/fields.py
229 }
230
231 src_compile() {
232 distutils_src_compile
233
234 if use doc; then
235 einfo "Generation of documentation"
236 pushd docs > /dev/null
237 emake html || die "Generation of documentation failed"
238 popd > /dev/null
239 fi
240 }
241
242 src_test() {
243 testing() {
244 # Tests have non-standard assumptions about PYTHONPATH and
245 # don't work with usual "build-${PYTHON_ABI}/lib".
246 PYTHONPATH="." "$(PYTHON)" tests/runtests.py --settings=test_sqlite -v1
247 }
248 python_execute_function testing
249 }
250
251 src_install() {
252 distutils_src_install
253
254 newbashcomp extras/django_bash_completion ${PN} || die
255
256 if use doc; then
257 rm -fr docs/_build/html/_sources
258 dohtml -A txt -r docs/_build/html/* || die "dohtml failed"
259 fi
260
261 insinto "${MY_HTDOCSDIR#${EPREFIX}}"
262 doins -r django/contrib/admin/media/* || die "doins failed"
263
264 webapp_src_install
265 }
266
267 pkg_preinst() {
268 :
269 }
270
271 pkg_postinst() {
272 distutils_pkg_postinst
273
274 einfo "Now, Django has the best of both worlds with Gentoo,"
275 einfo "ease of deployment for production and development."
276 echo
277 elog "A copy of the admin media is available to"
278 elog "webapp-config for installation in a webroot,"
279 elog "as well as the traditional location in python's"
280 elog "site-packages dir for easy development"
281 echo
282 ewarn "If you build Django ${PV} without USE=\"vhosts\""
283 ewarn "webapp-config will automatically install the"
284 ewarn "admin media into the localhost webroot."
285 }