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

[bam at users.alioth.debian.org]

    Date: Wednesday, August 13, 2014 @ 03:34:40
  Author: bam
Revision: 30145

Python3 package and remove south test.

Modified:
  packages/django-nose/trunk/debian/changelog
  packages/django-nose/trunk/debian/control
  packages/django-nose/trunk/debian/patches/runtests.patch
  packages/django-nose/trunk/debian/rules

Modified: packages/django-nose/trunk/debian/changelog
===================================================================
--- packages/django-nose/trunk/debian/changelog	2014-08-13 03:02:16 UTC (rev 30144)
+++ packages/django-nose/trunk/debian/changelog	2014-08-13 03:34:40 UTC (rev 30145)
@@ -1,3 +1,10 @@
+django-nose (1.2-2) unstable; urgency=low
+
+  * Python 3 package.
+  * Disable django-south in tests. Closes: #755665.
+
+ -- Brian May <bam at debian.org>  Wed, 13 Aug 2014 13:15:21 +1000
+
 django-nose (1.2-1) unstable; urgency=low
 
   [ Jakub Wilk ]

Modified: packages/django-nose/trunk/debian/control
===================================================================
--- packages/django-nose/trunk/debian/control	2014-08-13 03:02:16 UTC (rev 30144)
+++ packages/django-nose/trunk/debian/control	2014-08-13 03:34:40 UTC (rev 30145)
@@ -2,14 +2,18 @@
 Section: python
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Michael Fladischer <FladischerMichael at fladi.at>
+Uploaders: Michael Fladischer <FladischerMichael at fladi.at>,
+ Brian May <bam at debian.org>
 Build-Depends: debhelper (>= 8.1.0~),
                dh-python,
                python-all,
                python-django,
-               python-django-south,
                python-nose,
-               python-setuptools
+               python-setuptools,
+               python3-all,
+               python3-django,
+               python3-nose,
+               python3-setuptools
 Standards-Version: 3.9.5
 X-Python-Version: >= 2.5
 Homepage: http://pypi.python.org/pypi/django-nose/
@@ -24,3 +28,12 @@
  extending the Django management CLI with nose-related options.
  Those options are targeted at running nose tests directly from within the
  Django management system (e.g. django-admin).
+
+Package: python3-django-nose
+Architecture: all
+Depends: python-django, python-nose, ${misc:Depends}, ${python:Depends}
+Description: Django test runner that uses python-nose
+ python-django-nose integrates python-nose into Django test runner by
+ extending the Django management CLI with nose-related options.
+ Those options are targeted at running nose tests directly from within the
+ Django management system (e.g. django-admin).

Modified: packages/django-nose/trunk/debian/patches/runtests.patch
===================================================================
--- packages/django-nose/trunk/debian/patches/runtests.patch	2014-08-13 03:02:16 UTC (rev 30144)
+++ packages/django-nose/trunk/debian/patches/runtests.patch	2014-08-13 03:34:40 UTC (rev 30145)
@@ -8,8 +8,10 @@
 Last-Update: 2011-11-26
 Forwarded: no
 
---- a/runtests.sh
-+++ b/runtests.sh
+Index: django-nose/runtests.sh
+===================================================================
+--- django-nose.orig/runtests.sh	2013-07-24 03:23:04.000000000 +1000
++++ django-nose/runtests.sh	2014-08-13 13:22:41.531346643 +1000
 @@ -1,6 +1,9 @@
  #!/bin/sh
  
@@ -20,7 +22,7 @@
  
  django_test() {
      TEST="$1"
-@@ -25,9 +28,8 @@
+@@ -25,9 +28,7 @@
      fi
  }
  
@@ -31,7 +33,6 @@
 -django_test 'django-admin.py test --settings=testapp.settings_with_plugins testapp/plugin_t' '1' 'with plugins'
 -django_test 'django-admin.py test --settings=testapp.settings unittests' '4' 'unittests'
 +django_test "$PYTHON /usr/bin/django-admin test --settings=testapp.settings" '2' 'normal settings'
-+django_test "$PYTHON /usr/bin/django-admin test --settings=testapp.settings_with_south" '2' 'with south in installed apps'
 +django_test "$PYTHON /usr/bin/django-admin test --settings=testapp.settings_old_style" '2' 'django_nose.run_tests format'
 +django_test "$PYTHON testapp/runtests.py testapp.test_only_this" '1' 'via run_tests API'
 +django_test "$PYTHON /usr/bin/django-admin test --settings=testapp.settings_with_plugins testapp/plugin_t" '1' 'with plugins'

Modified: packages/django-nose/trunk/debian/rules
===================================================================
--- packages/django-nose/trunk/debian/rules	2014-08-13 03:02:16 UTC (rev 30144)
+++ packages/django-nose/trunk/debian/rules	2014-08-13 03:34:40 UTC (rev 30145)
@@ -1,11 +1,13 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+export PYBUILD_NAME=django-nose
+
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 %:
-	dh $@ --with=python2
+	dh $@ --with=python2,python3 --buildsystem=pybuild
 
 .PHONY: override_dh_auto_test
 override_dh_auto_test:
@@ -14,9 +16,7 @@
 	for python in $(shell pyversions -r); do \
 	  PYTHON=$$python ./runtests.sh; \
 	done
+	for python in $(shell py3versions -r); do \
+	  PYTHON=$$python ./runtests.sh; \
+	done
 endif
-
-.PHONY: override_dh_auto_install
-override_dh_auto_install:
-	dh_auto_install
-	sed -i 's/Metadata-Version: 1\.0/Metadata-Version: 1\.1/' debian/python-django-nose/usr/lib/python2.*/*-packages/django_nose-*.egg-info/PKG-INFO