[Python-modules-commits] r29842 - in packages/python-django/trunk/debian (3 files)

[hertzog at users.alioth.debian.org]

    Date: Monday, July 21, 2014 @ 23:13:18
  Author: hertzog
Revision: 29842

* Snapshot tarball generated with "python setup.py sdist" after having
  applied fix submitted in https://code.djangoproject.com/ticket/23072
* Added python-sqlparse, python-tz to Recommends
* Added other optional dependencies (python-memcache, python-pil,
  python-bcrypt) to Suggests
* Add all those dependencies in Build-Depends for the benefit of the
  test suite.

Modified:
  packages/python-django/trunk/debian/changelog
  packages/python-django/trunk/debian/control
  packages/python-django/trunk/debian/rules

Modified: packages/python-django/trunk/debian/changelog
===================================================================
--- packages/python-django/trunk/debian/changelog	2014-07-21 21:53:25 UTC (rev 29841)
+++ packages/python-django/trunk/debian/changelog	2014-07-21 23:13:18 UTC (rev 29842)
@@ -1,15 +1,15 @@
-python-django (1.7~c1-1) UNRELEASED; urgency=medium
+python-django (1.7~c1+20140722-1) experimental; urgency=medium
 
   * New upstream release candidate. We want this version in jessie so we
     should prepare now.
+  * Snapshot tarball generated with "python setup.py sdist" after having
+    applied fix submitted in https://code.djangoproject.com/ticket/23072
+  * Added python-sqlparse, python-tz to Recommends
+  * Added other optional dependencies (python-memcache, python-pil,
+    python-bcrypt) to Suggests
+  * Add all those dependencies in Build-Depends for the benefit of the
+    test suite.
 
-  TODO:
-  - fix test failure on test_template
-    (django.contrib.formtools.tests.wizard.wizardtests.tests.WizardTestKwargs)
-    TemplateDoesNotExist: other_wizard_form.html
-  - run test suite with python3 too
-  - review the build dependencies and dependencies
-
  -- Raphaël Hertzog <hertzog at debian.org>  Mon, 21 Jul 2014 21:57:07 +0200
 
 python-django (1.6.5-3) unstable; urgency=low

Modified: packages/python-django/trunk/debian/control
===================================================================
--- packages/python-django/trunk/debian/control	2014-07-21 21:53:25 UTC (rev 29841)
+++ packages/python-django/trunk/debian/control	2014-07-21 23:13:18 UTC (rev 29842)
@@ -7,7 +7,18 @@
  Chris Lamb <lamby at debian.org>,
  Brian May <bam at debian.org>
 Standards-Version: 3.9.5
-Build-Depends: debhelper (>= 9), dh-python, python-all (>= 2.6.6-3~), python3-all, python-sphinx (>= 1.0.8), locales (>= 0)
+Build-Depends: debhelper (>= 9), dh-python, python-all (>= 2.6.6-3~), python3-all, python-sphinx (>= 1.0.8), locales (>= 0),
+# Needed to enable supplementary tests in test suite
+ python-bcrypt, python3-bcrypt,
+ python-docutils, python3-docutils,
+ python-numpy, python3-numpy,
+ python-pil, python3-pil,
+ python-yaml, python3-yaml,
+ python-tz, python3-tz,
+ python-setuptools, python3-setuptools,
+# python-memcache, python3-memcache, memcached, # we can't rely on running daemon
+ python-sqlparse, python3-sqlparse,
+# python-selenium in theory too... but it's not properly packaged
 Build-Depends-Indep: libjs-jquery
 Homepage: http://www.djangoproject.com/
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-django/trunk/
@@ -16,8 +27,8 @@
 Package: python-django
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}, python-django-common (= ${binary:Version})
-Recommends: libjs-jquery
-Suggests: python-psycopg2, python-mysqldb, python-flup, python-sqlite, python-yaml, geoip-database-contrib, gettext, python-django-doc, ipython, bpython, libgdal1
+Recommends: libjs-jquery, python-sqlparse, python-tz
+Suggests: python-psycopg2, python-mysqldb, python-flup, python-sqlite, python-memcache, python-pil, python-bcrypt, python-yaml, geoip-database-contrib, gettext, python-django-doc, ipython, bpython, libgdal1
 Description: High-level Python web development framework
  Django is a high-level web application framework that loosely follows the
  model-view-controller design pattern.
@@ -43,8 +54,8 @@
 Package: python3-django
 Architecture: all
 Depends: ${misc:Depends}, ${python3:Depends}, python-django-common (= ${binary:Version})
-Recommends: libjs-jquery
-Suggests: python3-psycopg2, python3-mysqldb, python3-flup, python3-sqlite, python3-yaml, geoip-database-contrib, gettext, python-django-doc, ipython3, bpython3, libgdal1
+Recommends: libjs-jquery, python3-sqlparse, python3-tz
+Suggests: python3-psycopg2, python3-mysqldb, python3-flup, python3-sqlite, python3-memcache, python3-pil, python3-bcrypt, python3-yaml, geoip-database-contrib, gettext, python-django-doc, ipython3, bpython3, libgdal1
 Description: High-level Python web development framework
  Django is a high-level web application framework that loosely follows the
  model-view-controller design pattern.

Modified: packages/python-django/trunk/debian/rules
===================================================================
--- packages/python-django/trunk/debian/rules	2014-07-21 21:53:25 UTC (rev 29841)
+++ packages/python-django/trunk/debian/rules	2014-07-21 23:13:18 UTC (rev 29842)
@@ -29,7 +29,8 @@
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	mkdir -p tmp-locales
 	localedef -i /usr/share/i18n/locales/en_US -c -f UTF-8 -A /usr/share/locale/locale.alias tmp-locales/en_US.UTF-8
-	cd tests && LOCPATH=$(CURDIR)/tmp-locales LC_ALL=en_US.UTF-8 PYTHONPATH=.. ./runtests.py --settings=test_sqlite --verbosity=2
+	cd tests && LOCPATH=$(CURDIR)/tmp-locales LC_ALL=en_US.UTF-8 PYTHONPATH=.. python ./runtests.py --verbosity=2
+	cd tests && LOCPATH=$(CURDIR)/tmp-locales LC_ALL=en_US.UTF-8 PYTHONPATH=.. python3 ./runtests.py--verbosity=2
 	rm -rf tmp-locales
 endif