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

[fladi-guest at users.alioth.debian.org]

    Date: Friday, April 20, 2012 @ 16:25:36
  Author: fladi-guest
Revision: 21314

Fix FTBFS with django (>= 1.4) (Closes: #669493).

Added:
  packages/django-picklefield/trunk/debian/settings.py
Modified:
  packages/django-picklefield/trunk/debian/changelog
  packages/django-picklefield/trunk/debian/control
  packages/django-picklefield/trunk/debian/rules

Modified: packages/django-picklefield/trunk/debian/changelog
===================================================================
--- packages/django-picklefield/trunk/debian/changelog	2012-04-20 10:58:21 UTC (rev 21313)
+++ packages/django-picklefield/trunk/debian/changelog	2012-04-20 16:25:36 UTC (rev 21314)
@@ -1,3 +1,11 @@
+django-picklefield (0.2.0-2) UNRELEASED; urgency=low
+
+  * Fix tests for django (>= 1.4) FTBFS (Closes: #669493).
+    - Add our own settings.py for the tests
+    - Bump B-D on python-django to (>= 1.4)
+
+ -- Michael Fladischer <FladischerMichael at fladi.at>  Fri, 20 Apr 2012 18:22:53 +0200
+
 django-picklefield (0.2.0-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/django-picklefield/trunk/debian/control
===================================================================
--- packages/django-picklefield/trunk/debian/control	2012-04-20 10:58:21 UTC (rev 21313)
+++ packages/django-picklefield/trunk/debian/control	2012-04-20 16:25:36 UTC (rev 21314)
@@ -5,7 +5,7 @@
 Uploaders: Michael Fladischer <FladischerMichael at fladi.at>
 Build-Depends: debhelper (>= 7.0.50~),
                python-all (>= 2.5),
-               python-django,
+               python-django (>= 1.4),
                python-setuptools,
                python-support
 Standards-Version: 3.9.3

Modified: packages/django-picklefield/trunk/debian/rules
===================================================================
--- packages/django-picklefield/trunk/debian/rules	2012-04-20 10:58:21 UTC (rev 21313)
+++ packages/django-picklefield/trunk/debian/rules	2012-04-20 16:25:36 UTC (rev 21314)
@@ -12,11 +12,10 @@
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	django-admin startproject testproject
-	echo 'DATABASE_ENGINE = "sqlite3"' > testproject/settings.py
-	echo 'INSTALLED_APPS = ["picklefield"]' >> testproject/settings.py
+	cp debian/settings.py testproject/testproject/
 	set -e; \
 	for python in $(shell pyversions -r); do \
-	  PYTHONPATH=".:src" $$python testproject/manage.py test --settings=testproject.settings; \
+		PYTHONPATH=".:src:testproject" $$python testproject/manage.py test --settings=testproject.settings picklefield ; \
 	done
 	rm -rf testproject
 endif

Added: packages/django-picklefield/trunk/debian/settings.py
===================================================================
--- packages/django-picklefield/trunk/debian/settings.py	                        (rev 0)
+++ packages/django-picklefield/trunk/debian/settings.py	2012-04-20 16:25:36 UTC (rev 21314)
@@ -0,0 +1,10 @@
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': 'testproject/test.db3'
+    }
+}
+INSTALLED_APPS = ["picklefield"]
+SITE_ID = 1
+ROOT_URLCONF = "testproject.urls"
+SECRET_KEY = "1"