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

[hertzog at users.alioth.debian.org]

    Date: Monday, July 21, 2014 @ 21:53:25
  Author: hertzog
Revision: 29841

New upstream release candidate. We want this version in jessie so we
should prepare now.

Modified:
  packages/python-django/trunk/debian/changelog
  packages/python-django/trunk/debian/patches/02_disable-sources-in-sphinxdoc.diff
  packages/python-django/trunk/debian/patches/06_use_debian_geoip_database_as_default.diff
  packages/python-django/trunk/debian/rules

Modified: packages/python-django/trunk/debian/changelog
===================================================================
--- packages/python-django/trunk/debian/changelog	2014-07-21 20:42:52 UTC (rev 29840)
+++ packages/python-django/trunk/debian/changelog	2014-07-21 21:53:25 UTC (rev 29841)
@@ -1,3 +1,17 @@
+python-django (1.7~c1-1) UNRELEASED; urgency=medium
+
+  * New upstream release candidate. We want this version in jessie so we
+    should prepare now.
+
+  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
 
   * Replace django-admin with script that can be run as python and shell.

Modified: packages/python-django/trunk/debian/patches/02_disable-sources-in-sphinxdoc.diff
===================================================================
--- packages/python-django/trunk/debian/patches/02_disable-sources-in-sphinxdoc.diff	2014-07-21 20:42:52 UTC (rev 29840)
+++ packages/python-django/trunk/debian/patches/02_disable-sources-in-sphinxdoc.diff	2014-07-21 21:53:25 UTC (rev 29841)
@@ -9,7 +9,7 @@
 
 --- a/docs/conf.py
 +++ b/docs/conf.py
-@@ -185,7 +185,10 @@ html_additional_pages = {}
+@@ -196,7 +196,10 @@ html_additional_pages = {}
  #html_split_index = False
  
  # If true, links to the reST sources are added to the pages.

Modified: packages/python-django/trunk/debian/patches/06_use_debian_geoip_database_as_default.diff
===================================================================
--- packages/python-django/trunk/debian/patches/06_use_debian_geoip_database_as_default.diff	2014-07-21 20:42:52 UTC (rev 29840)
+++ packages/python-django/trunk/debian/patches/06_use_debian_geoip_database_as_default.diff	2014-07-21 21:53:25 UTC (rev 29841)
@@ -9,7 +9,7 @@
 
 --- a/django/contrib/gis/geoip/base.py
 +++ b/django/contrib/gis/geoip/base.py
-@@ -64,7 +64,8 @@
+@@ -67,7 +67,8 @@ class GeoIP(object):
          * path: Base directory to where GeoIP data is located or the full path
              to where the city or country data files (*.dat) are located.
              Assumes that both the city and country data sets are located in
@@ -19,7 +19,7 @@
  
          * cache: The cache settings when opening up the GeoIP datasets,
              and may be an integer in (0, 1, 2, 4, 8) corresponding to
-@@ -73,11 +74,13 @@
+@@ -76,11 +77,13 @@ class GeoIP(object):
              settings,  respectively.  Defaults to 0, meaning that the data is read
              from the disk.
  
@@ -38,17 +38,18 @@
          """
          # Checking the given cache option.
          if cache in self.cache_options:
-@@ -87,8 +90,7 @@
+@@ -90,9 +93,7 @@ class GeoIP(object):
  
          # Getting the GeoIP data path.
          if not path:
 -            path = GEOIP_SETTINGS.get('GEOIP_PATH', None)
--            if not path: raise GeoIPException('GeoIP path must be provided via parameter or the GEOIP_PATH setting.')
+-            if not path:
+-                raise GeoIPException('GeoIP path must be provided via parameter or the GEOIP_PATH setting.')
 +            path = GEOIP_SETTINGS.get('GEOIP_PATH', '/usr/share/GeoIP')
          if not isinstance(path, six.string_types):
              raise TypeError('Invalid path type: %s' % type(path).__name__)
  
-@@ -101,7 +103,7 @@
+@@ -105,7 +106,7 @@ class GeoIP(object):
                  self._country = GeoIP_open(force_bytes(country_db), cache)
                  self._country_file = country_db
  

Modified: packages/python-django/trunk/debian/rules
===================================================================
--- packages/python-django/trunk/debian/rules	2014-07-21 20:42:52 UTC (rev 29840)
+++ packages/python-django/trunk/debian/rules	2014-07-21 21:53:25 UTC (rev 29841)
@@ -10,7 +10,7 @@
 	dh $@ --with sphinxdoc,python2,python3 --buildsystem=pybuild
 
 override_dh_auto_clean:
-	rm -rf docs.debian tests/__init__.py
+	rm -rf docs.debian
 	find -name "*.DS_Store" -delete
 	chmod a-x django/contrib/gis/tests/data/texas.dbf
 	dh_auto_clean
@@ -27,10 +27,9 @@
 
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	touch tests/__init__.py
 	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
-	LOCPATH=$(CURDIR)/tmp-locales LC_ALL=en_US.UTF-8 PYTHONPATH=. tests/runtests.py --settings=tests.test_sqlite --verbosity=2
+	cd tests && LOCPATH=$(CURDIR)/tmp-locales LC_ALL=en_US.UTF-8 PYTHONPATH=.. ./runtests.py --settings=test_sqlite --verbosity=2
 	rm -rf tmp-locales
 endif