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

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

    Date: Thursday, August 15, 2013 @ 18:02:52
  Author: fladi-guest
Revision: 25595

Reenable tests by adding python-django-discover-runner to Build-Depends.

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

Modified: packages/django-floppyforms/trunk/debian/changelog
===================================================================
--- packages/django-floppyforms/trunk/debian/changelog	2013-08-15 17:13:41 UTC (rev 25594)
+++ packages/django-floppyforms/trunk/debian/changelog	2013-08-15 18:02:52 UTC (rev 25595)
@@ -1,7 +1,8 @@
-django-floppyforms (1.1-1) unstable; urgency=low
+django-floppyforms (1.1-1) UNRELEASED; urgency=low
 
   [ Michael Fladischer ]
   * New upstream release.
+  * Add python-django-discover-runner to Build-Depends so tests can run.
   * Bump Depends and Build-Depends on python-django to >= 1.4.2.
   * Bump Standards version to 3.9.4.
   * Bump Build-Depends on debhelper to >= 8.1.0 to satisfy build-arch
@@ -10,16 +11,11 @@
   * Drop temporary fix for PKG-INFO.
   * Remove src directory from PYTHONPATH in d/rules.
   * Update years in d/copyright.
-  * Disable unit tests because they require django-discover-runner which is not
-    packaged for Debian at the moment.
-    - Comment out code ind/rules.
-    - Remove python-django from Build-Depends.
-    - Remove d/settings.py because upstream ships its own version.
 
   [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
 
- -- Michael Fladischer <FladischerMichael at fladi.at>  Wed, 08 May 2013 11:41:21 +0200
+ -- Michael Fladischer <FladischerMichael at fladi.at>  Thu, 15 Aug 2013 19:57:27 +0200
 
 django-floppyforms (0.4.7-2) unstable; urgency=low
 

Modified: packages/django-floppyforms/trunk/debian/control
===================================================================
--- packages/django-floppyforms/trunk/debian/control	2013-08-15 17:13:41 UTC (rev 25594)
+++ packages/django-floppyforms/trunk/debian/control	2013-08-15 18:02:52 UTC (rev 25595)
@@ -5,6 +5,8 @@
 Uploaders: Michael Fladischer <FladischerMichael at fladi.at>
 Build-Depends: debhelper (>= 8.1.0~),
                python-all (>= 2.6.6-3~),
+               python-django (>= 1.4.2),
+               python-django-discover-runner,
                python-setuptools
 Standards-Version: 3.9.4
 X-Python-Version: >= 2.6

Modified: packages/django-floppyforms/trunk/debian/rules
===================================================================
--- packages/django-floppyforms/trunk/debian/rules	2013-08-15 17:13:41 UTC (rev 25594)
+++ packages/django-floppyforms/trunk/debian/rules	2013-08-15 18:02:52 UTC (rev 25595)
@@ -2,12 +2,11 @@
 %:
 	dh $@ --with python2
 
-# Disabled because floppyforms 1.1 relies on django-discover-runner for unit tests.
-#.PHONY: override_dh_auto_test
-#override_dh_auto_test:
-#ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-#	set -e; \
-#	for python in $(shell pyversions -r); do \
-#		PYTHONPATH="." $$python $(shell which django-admin) test floppyforms --settings=floppyforms.test_settings; \
-#	done
-#endif
+.PHONY: override_dh_auto_test
+override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+	set -e; \
+	for python in $(shell pyversions -r); do \
+		PYTHONPATH="." $$python $(shell which django-admin) test floppyforms --settings=floppyforms.test_settings; \
+	done
+endif