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

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

    Date: Wednesday, June 5, 2013 @ 14:22:51
  Author: fladi-guest
Revision: 24666

Temporarily disable unit tests and bump Standards-Version.

Modified:
  packages/django-floppyforms/trunk/debian/changelog
  packages/django-floppyforms/trunk/debian/control
  packages/django-floppyforms/trunk/debian/rules
Deleted:
  packages/django-floppyforms/trunk/debian/settings.py

Modified: packages/django-floppyforms/trunk/debian/changelog
===================================================================
--- packages/django-floppyforms/trunk/debian/changelog	2013-06-05 12:51:13 UTC (rev 24665)
+++ packages/django-floppyforms/trunk/debian/changelog	2013-06-05 14:22:51 UTC (rev 24666)
@@ -2,10 +2,19 @@
 
   [ Michael Fladischer ]
   * New upstream release.
-  * Bump dependency on Django to >= 1.3.
+  * 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
+    and build-indep targets.
   * Format packaging files with wrap-and-sort.
   * 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.

Modified: packages/django-floppyforms/trunk/debian/control
===================================================================
--- packages/django-floppyforms/trunk/debian/control	2013-06-05 12:51:13 UTC (rev 24665)
+++ packages/django-floppyforms/trunk/debian/control	2013-06-05 14:22:51 UTC (rev 24666)
@@ -3,11 +3,10 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Michael Fladischer <FladischerMichael at fladi.at>
-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends: debhelper (>= 8.1.0~),
                python-all (>= 2.6.6-3~),
-               python-django (>= 1.3),
                python-setuptools
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 X-Python-Version: >= 2.6
 Homepage: https://github.com/brutasse/django-floppyforms
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/django-floppyforms/trunk/
@@ -15,7 +14,7 @@
 
 Package: python-django-floppyforms
 Architecture: all
-Depends: python-django (>= 1.3), ${misc:Depends}, ${python:Depends}
+Depends: python-django (>= 1.4.2), ${misc:Depends}, ${python:Depends}
 Description: better control of form rendering in Django
  Django-foppyforms is an application that gives you full control of the
  output of forms rendering. This is more a widgets library than a forms

Modified: packages/django-floppyforms/trunk/debian/rules
===================================================================
--- packages/django-floppyforms/trunk/debian/rules	2013-06-05 12:51:13 UTC (rev 24665)
+++ packages/django-floppyforms/trunk/debian/rules	2013-06-05 14:22:51 UTC (rev 24666)
@@ -2,18 +2,12 @@
 %:
 	dh $@ --with python2
 
-.PHONY: override_dh_auto_test
-override_dh_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	django-admin startproject testproject
-	if [ -d testproject/testproject ]; then \
-		cp debian/settings.py testproject/testproject ; \
-	else \
-		cp debian/settings.py testproject ; \
-	fi
-	set -e; \
-	for python in $(shell pyversions -r); do \
-		PYTHONPATH=".:src:testproject" $$python testproject/manage.py test --settings=testproject.settings floppyforms ; \
-	done
-	rm -rf testproject
-endif
+# 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

Deleted: packages/django-floppyforms/trunk/debian/settings.py
===================================================================
--- packages/django-floppyforms/trunk/debian/settings.py	2013-06-05 12:51:13 UTC (rev 24665)
+++ packages/django-floppyforms/trunk/debian/settings.py	2013-06-05 14:22:51 UTC (rev 24666)
@@ -1,9 +0,0 @@
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': 'testproject/test.db3'
-    }
-}
-INSTALLED_APPS = ['floppyforms']
-SECRET_KEY = "1"
-