[Python-modules-commits] r32693 - in packages/django-nose/tags (15 files)
fladi-guest at users.alioth.debian.org
fladi-guest at users.alioth.debian.org
Tue May 19 07:38:50 UTC 2015
Date: Tuesday, May 19, 2015 @ 07:38:49
Author: fladi-guest
Revision: 32693
[svn-buildpackage] Tagging django-nose 1.4-1
Added:
packages/django-nose/tags/1.4-1/
packages/django-nose/tags/1.4-1/debian/changelog
(from rev 32692, packages/django-nose/trunk/debian/changelog)
packages/django-nose/tags/1.4-1/debian/control
(from rev 32691, packages/django-nose/trunk/debian/control)
packages/django-nose/tags/1.4-1/debian/copyright
(from rev 32686, packages/django-nose/trunk/debian/copyright)
packages/django-nose/tags/1.4-1/debian/patches/django17.patch
(from rev 32169, packages/django-nose/trunk/debian/patches/django17.patch)
packages/django-nose/tags/1.4-1/debian/patches/runtests.patch
(from rev 32689, packages/django-nose/trunk/debian/patches/runtests.patch)
packages/django-nose/tags/1.4-1/debian/rules
(from rev 32690, packages/django-nose/trunk/debian/rules)
packages/django-nose/tags/1.4-1/debian/watch
(from rev 32163, packages/django-nose/trunk/debian/watch)
Deleted:
packages/django-nose/tags/1.4-1/debian/changelog
packages/django-nose/tags/1.4-1/debian/control
packages/django-nose/tags/1.4-1/debian/copyright
packages/django-nose/tags/1.4-1/debian/patches/django17.patch
packages/django-nose/tags/1.4-1/debian/patches/runtests.patch
packages/django-nose/tags/1.4-1/debian/rules
packages/django-nose/tags/1.4-1/debian/watch
Deleted: packages/django-nose/tags/1.4-1/debian/changelog
===================================================================
--- packages/django-nose/trunk/debian/changelog 2015-04-03 07:10:31 UTC (rev 32162)
+++ packages/django-nose/tags/1.4-1/debian/changelog 2015-05-19 07:38:49 UTC (rev 32693)
@@ -1,91 +0,0 @@
-django-nose (1.2-3) unstable; urgency=low
-
- * Fix Django 1.7 AppRegistryNotReady error, by calling django.setup() in
- tests. Closes: #763252.
-
- -- Brian May <bam at debian.org> Mon, 29 Sep 2014 11:40:22 +1000
-
-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 ]
- * Use canonical URIs for Vcs-* fields.
-
- [ Michael Fladischer ]
- * New upstream release (Closes: #711360).
- * Switch to dh_python2.
- * Build-Depends on dh-python.
- * Bump Standards version to 3.9.5.
- * Bump Build-Depends on debhelper to >= 8.1.0 to satisfy build-arch
- and build-indep targets.
- * Drop versioned Build-Depends on python-all as no prior versions are
- available in Wheezy.
- * Drop versioned Depends and Build-Depends on python-django as no prior
- versions are available in Wheezy.
- * Use correct DEP5 format URL for d/copyright.
- * Rename BSD-django-nose to BSD-3-clause license.
- * Refresh patch.
- * Update years in d/copyright.
-
- -- Michael Fladischer <FladischerMichael at fladi.at> Mon, 16 Dec 2013 13:56:11 +0100
-
-django-nose (1.1-1) unstable; urgency=low
-
- * New upstream release.
- * Make temporary Metadata-Version fix more generic for future
- versions.
- * Bump Standards version to 3.9.3.
- * Use BSD-django-nose as license name in d/copyright.
- * Change order of my name.
- * Add email addresses to authors in d/copyright.
- * Use PyPi URL in d/watch.
-
- -- Michael Fladischer <FladischerMichael at fladi.at> Mon, 04 Jun 2012 19:28:30 +0200
-
-django-nose (0.1.3-1) unstable; urgency=low
-
- * New upstream release.
- * Bump standards version to 3.9.2 (no change).
- * Use wrap-and-sort on debian/*.
- * Bump python-django dependency to (>= 1.2).
- * Temporary fix for Metadata-Version in PKG-INFO (see #645125).
- * Use http://githubredir.debian.net in d/watch to get clean tarball.
- * Use runtests.sh provided by upstream to run all tests.
- * Add python-django-south to Build-Depends to be able to run all
- tests.
- * Add patch for runtests.sh to enable the use of non-default python
- versions for running the tests.
-
- -- Fladischer Michael <FladischerMichael at fladi.at> Sat, 26 Nov 2011 13:55:48 +0100
-
-django-nose (0.1.2-2) unstable; urgency=low
-
- * Upload to unstable.
- * Update DEP5 format.
- * Set PMPT as maintainer and myself as uploader.
- * Provide a more verbose long description.
- * Drop debian/pyversions in favour of XS-Python-Version.
-
- -- Fladischer Michael <FladischerMichael at fladi.at> Mon, 07 Feb 2011 14:17:27 +0100
-
-django-nose (0.1.2-1) experimental; urgency=low
-
- * New upstream release.
- * Update to Debian policy 3.9.1.
- * Drop do_not_install_testapp patch as it has been integrated by
- upstream.
- * Update copyright year.
-
- -- Fladischer Michael <FladischerMichael at fladi.at> Fri, 03 Dec 2010 00:41:23 +0100
-
-django-nose (0.1-1) unstable; urgency=low
-
- * Initial release (Closes: #584106)
-
- -- Fladischer Michael <FladischerMichael at fladi.at> Wed, 16 Jun 2010 13:15:15 +0200
Copied: packages/django-nose/tags/1.4-1/debian/changelog (from rev 32692, packages/django-nose/trunk/debian/changelog)
===================================================================
--- packages/django-nose/tags/1.4-1/debian/changelog (rev 0)
+++ packages/django-nose/tags/1.4-1/debian/changelog 2015-05-19 07:38:49 UTC (rev 32693)
@@ -0,0 +1,110 @@
+django-nose (1.4-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Use github repository for uscan.
+ * Bump Standards-Version to 3.9.6.
+ * Add gawk to Build-Depends because it is required by runtests.sh.
+ * Refresh runtests.patch.
+ * Use correct Python version to determine tests to run in
+ runtests.patch.
+ * Remove PHONY target declarations from d/rules.
+ * Use only one for loop to run the tests for all requested Python versions.
+ * Use distinctive description for python3 package.
+ * Line-wrap Depends fields for easier reading.
+ * Add X-Python3-Version for versions => 3.3.
+ * Add DEP3 header to django17.patch.
+ * Change my email address to fladi at debian.org.
+
+ -- Michael Fladischer <fladi at debian.org> Tue, 19 May 2015 08:41:05 +0200
+
+django-nose (1.2-3) unstable; urgency=low
+
+ * Fix Django 1.7 AppRegistryNotReady error, by calling django.setup() in
+ tests. Closes: #763252.
+
+ -- Brian May <bam at debian.org> Mon, 29 Sep 2014 11:40:22 +1000
+
+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 ]
+ * Use canonical URIs for Vcs-* fields.
+
+ [ Michael Fladischer ]
+ * New upstream release (Closes: #711360).
+ * Switch to dh_python2.
+ * Build-Depends on dh-python.
+ * Bump Standards version to 3.9.5.
+ * Bump Build-Depends on debhelper to >= 8.1.0 to satisfy build-arch
+ and build-indep targets.
+ * Drop versioned Build-Depends on python-all as no prior versions are
+ available in Wheezy.
+ * Drop versioned Depends and Build-Depends on python-django as no prior
+ versions are available in Wheezy.
+ * Use correct DEP5 format URL for d/copyright.
+ * Rename BSD-django-nose to BSD-3-clause license.
+ * Refresh patch.
+ * Update years in d/copyright.
+
+ -- Michael Fladischer <FladischerMichael at fladi.at> Mon, 16 Dec 2013 13:56:11 +0100
+
+django-nose (1.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Make temporary Metadata-Version fix more generic for future
+ versions.
+ * Bump Standards version to 3.9.3.
+ * Use BSD-django-nose as license name in d/copyright.
+ * Change order of my name.
+ * Add email addresses to authors in d/copyright.
+ * Use PyPi URL in d/watch.
+
+ -- Michael Fladischer <FladischerMichael at fladi.at> Mon, 04 Jun 2012 19:28:30 +0200
+
+django-nose (0.1.3-1) unstable; urgency=low
+
+ * New upstream release.
+ * Bump standards version to 3.9.2 (no change).
+ * Use wrap-and-sort on debian/*.
+ * Bump python-django dependency to (>= 1.2).
+ * Temporary fix for Metadata-Version in PKG-INFO (see #645125).
+ * Use http://githubredir.debian.net in d/watch to get clean tarball.
+ * Use runtests.sh provided by upstream to run all tests.
+ * Add python-django-south to Build-Depends to be able to run all
+ tests.
+ * Add patch for runtests.sh to enable the use of non-default python
+ versions for running the tests.
+
+ -- Fladischer Michael <FladischerMichael at fladi.at> Sat, 26 Nov 2011 13:55:48 +0100
+
+django-nose (0.1.2-2) unstable; urgency=low
+
+ * Upload to unstable.
+ * Update DEP5 format.
+ * Set PMPT as maintainer and myself as uploader.
+ * Provide a more verbose long description.
+ * Drop debian/pyversions in favour of XS-Python-Version.
+
+ -- Fladischer Michael <FladischerMichael at fladi.at> Mon, 07 Feb 2011 14:17:27 +0100
+
+django-nose (0.1.2-1) experimental; urgency=low
+
+ * New upstream release.
+ * Update to Debian policy 3.9.1.
+ * Drop do_not_install_testapp patch as it has been integrated by
+ upstream.
+ * Update copyright year.
+
+ -- Fladischer Michael <FladischerMichael at fladi.at> Fri, 03 Dec 2010 00:41:23 +0100
+
+django-nose (0.1-1) unstable; urgency=low
+
+ * Initial release (Closes: #584106)
+
+ -- Fladischer Michael <FladischerMichael at fladi.at> Wed, 16 Jun 2010 13:15:15 +0200
Deleted: packages/django-nose/tags/1.4-1/debian/control
===================================================================
--- packages/django-nose/trunk/debian/control 2015-04-03 07:10:31 UTC (rev 32162)
+++ packages/django-nose/tags/1.4-1/debian/control 2015-05-19 07:38:49 UTC (rev 32693)
@@ -1,39 +0,0 @@
-Source: django-nose
-Section: python
-Priority: optional
-Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-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-nose,
- python-setuptools,
- python3-all,
- python3-django,
- python3-nose,
- python3-setuptools
-Standards-Version: 3.9.5
-X-Python-Version: >= 2.7
-Homepage: http://pypi.python.org/pypi/django-nose/
-Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/django-nose/trunk/
-Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/django-nose/trunk/
-
-Package: python-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).
-
-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).
Copied: packages/django-nose/tags/1.4-1/debian/control (from rev 32691, packages/django-nose/trunk/debian/control)
===================================================================
--- packages/django-nose/tags/1.4-1/debian/control (rev 0)
+++ packages/django-nose/tags/1.4-1/debian/control 2015-05-19 07:38:49 UTC (rev 32693)
@@ -0,0 +1,49 @@
+Source: django-nose
+Section: python
+Priority: optional
+Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Uploaders: Michael Fladischer <fladi at debian.org>,
+ Brian May <bam at debian.org>
+Build-Depends: debhelper (>= 8.1.0~),
+ dh-python,
+ gawk,
+ python-all,
+ python-django,
+ python-nose,
+ python-setuptools,
+ python3-all,
+ python3-django,
+ python3-nose,
+ python3-setuptools
+Standards-Version: 3.9.6
+X-Python-Version: >= 2.7
+X-Python3-Version: >= 3.3
+Homepage: http://pypi.python.org/pypi/django-nose/
+Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/django-nose/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/django-nose/trunk/
+
+Package: python-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).
+
+Package: python3-django-nose
+Architecture: all
+Depends: python-django,
+ python-nose,
+ ${misc:Depends},
+ ${python:Depends}
+Description: Django test runner that uses python-nose (Python3 version)
+ 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).
+ .
+ This package contains the Python 3 version of the library.
Deleted: packages/django-nose/tags/1.4-1/debian/copyright
===================================================================
--- packages/django-nose/trunk/debian/copyright 2015-04-03 07:10:31 UTC (rev 32162)
+++ packages/django-nose/tags/1.4-1/debian/copyright 2015-05-19 07:38:49 UTC (rev 32693)
@@ -1,38 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: django-nose
-Upstream-Contact: Jeff Balogh <me at jeffbalogh.org>
-Source: http://pypi.python.org/pypi/django-nose/
-
-Files: *
-Copyright: 2010-2013, Jeff Balogh <me at jeffbalogh.org>
-License: BSD-3-clause
-
-Files: debian/*
-Copyright: 2012-2013, Michael Fladischer <FladischerMichael at fladi.at>
-License: BSD-3-clause
-
-License: BSD-3-clause
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- .
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- .
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- .
- 3. Neither the name of django-nose nor the names of its contributors may be
- used to endorse or promote products derived from this software without
- specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Copied: packages/django-nose/tags/1.4-1/debian/copyright (from rev 32686, packages/django-nose/trunk/debian/copyright)
===================================================================
--- packages/django-nose/tags/1.4-1/debian/copyright (rev 0)
+++ packages/django-nose/tags/1.4-1/debian/copyright 2015-05-19 07:38:49 UTC (rev 32693)
@@ -0,0 +1,38 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: django-nose
+Upstream-Contact: Jeff Balogh <me at jeffbalogh.org>
+Source: http://pypi.python.org/pypi/django-nose/
+
+Files: *
+Copyright: 2010-2013, Jeff Balogh <me at jeffbalogh.org>
+License: BSD-3-clause
+
+Files: debian/*
+Copyright: 2012-2015, Michael Fladischer <fladi at debian.org>
+License: BSD-3-clause
+
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
+ .
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ .
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ .
+ 3. Neither the name of django-nose nor the names of its contributors may be
+ used to endorse or promote products derived from this software without
+ specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Deleted: packages/django-nose/tags/1.4-1/debian/patches/django17.patch
===================================================================
--- packages/django-nose/trunk/debian/patches/django17.patch 2015-04-03 07:10:31 UTC (rev 32162)
+++ packages/django-nose/tags/1.4-1/debian/patches/django17.patch 2015-05-19 07:38:49 UTC (rev 32693)
@@ -1,18 +0,0 @@
-Index: django-nose/testapp/runtests.py
-===================================================================
---- django-nose.orig/testapp/runtests.py 2013-03-28 13:40:25.000000000 +1100
-+++ django-nose/testapp/runtests.py 2014-09-29 11:37:55.271734265 +1000
-@@ -1,6 +1,7 @@
- #!/usr/bin/env python
- import sys
-
-+import django
- from django.conf import settings
-
- if not settings.configured:
-@@ -20,4 +21,5 @@
-
-
- if __name__ == '__main__':
-+ django.setup()
- runtests(*sys.argv[1:])
Copied: packages/django-nose/tags/1.4-1/debian/patches/django17.patch (from rev 32169, packages/django-nose/trunk/debian/patches/django17.patch)
===================================================================
--- packages/django-nose/tags/1.4-1/debian/patches/django17.patch (rev 0)
+++ packages/django-nose/tags/1.4-1/debian/patches/django17.patch 2015-05-19 07:38:49 UTC (rev 32693)
@@ -0,0 +1,24 @@
+Description: Call django.setup() befor running the tests.
+Author: Brian May <bam at debian.org>
+Last-Update: 2014-09-29
+Forwarded: no
+Bug-Debian: https://bugs.debian.org/763252
+
+Index: django-nose/testapp/runtests.py
+===================================================================
+--- django-nose.orig/testapp/runtests.py 2013-03-28 13:40:25.000000000 +1100
++++ django-nose/testapp/runtests.py 2014-09-29 11:37:55.271734265 +1000
+@@ -1,6 +1,7 @@
+ #!/usr/bin/env python
+ import sys
+
++import django
+ from django.conf import settings
+
+ if not settings.configured:
+@@ -20,4 +21,5 @@
+
+
+ if __name__ == '__main__':
++ django.setup()
+ runtests(*sys.argv[1:])
Deleted: packages/django-nose/tags/1.4-1/debian/patches/runtests.patch
===================================================================
--- packages/django-nose/trunk/debian/patches/runtests.patch 2015-04-03 07:10:31 UTC (rev 32162)
+++ packages/django-nose/tags/1.4-1/debian/patches/runtests.patch 2015-05-19 07:38:49 UTC (rev 32693)
@@ -1,38 +0,0 @@
-Description: Enable non-default python versions for test runs
- The original version of runtests.sh only allows to run the tests on the current
- default python version. This patch add the environment variable PYTHON that can
- be set to a specific python binary (e.g. python2.6) to run the tests with.
- It also changes the path for django-admin.py to the one supplied by the
- python-django package.
-Author: Michael Fladischer <FladischerMichael at fladi.at>
-Last-Update: 2011-11-26
-Forwarded: no
-
-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
-
- export PYTHONPATH=.
-+if [ -z $PYTHON ]; then
-+ export PYTHON=python
-+fi
-
- django_test() {
- TEST="$1"
-@@ -25,9 +28,7 @@
- fi
- }
-
--django_test 'django-admin.py test --settings=testapp.settings' '2' 'normal settings'
--django_test 'django-admin.py test --settings=testapp.settings_with_south' '2' 'with south in installed apps'
--django_test 'django-admin.py test --settings=testapp.settings_old_style' '2' 'django_nose.run_tests format'
--django_test 'testapp/runtests.py testapp.test_only_this' '1' 'via run_tests API'
--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_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'
Copied: packages/django-nose/tags/1.4-1/debian/patches/runtests.patch (from rev 32689, packages/django-nose/trunk/debian/patches/runtests.patch)
===================================================================
--- packages/django-nose/tags/1.4-1/debian/patches/runtests.patch (rev 0)
+++ packages/django-nose/tags/1.4-1/debian/patches/runtests.patch 2015-05-19 07:38:49 UTC (rev 32693)
@@ -0,0 +1,55 @@
+Description: Enable non-default python versions for test runs
+ The original version of runtests.sh only allows to run the tests on the current
+ default python version. This patch add the environment variable PYTHON that can
+ be set to a specific python binary (e.g. python2.6) to run the tests with.
+ It also changes the path for django-admin.py to the one supplied by the
+ python-django package.
+Author: Michael Fladischer <fladi at debian.org>
+Last-Update: 2011-11-26
+Forwarded: no
+
+Index: django-nose/runtests.sh
+===================================================================
+--- django-nose.orig/runtests.sh 2015-05-19 08:35:25.359622435 +0200
++++ django-nose/runtests.sh 2015-05-19 09:01:31.290969280 +0200
+@@ -1,8 +1,11 @@
+ #!/bin/bash
+
+ export PYTHONPATH=.
++if [ -z $PYTHON ]; then
++ export PYTHON=python
++fi
+
+-PYTHONVERSION=$(python --version 2>&1)
++PYTHONVERSION=$($PYTHON --version 2>&1)
+ PYTHONVERSION=${PYTHONVERSION##Python }
+
+ function version { echo $@ | gawk -F. '{ printf("%d.%d.%d\n", $1,$2,$3); }'; }
+@@ -37,19 +40,19 @@
+ fi
+ }
+
+-django_test 'django-admin.py test --settings=testapp.settings' '2' 'normal settings'
++django_test "$PYTHON /usr/bin/django-admin test --settings=testapp.settings" '2' 'normal settings'
+ if [ "$DJANGO" = "Django==1.4.1" -o "$DJANGO" = "Django==1.5" -o "$DJANGO" = "Django==1.6" ]
+ then
+- django_test 'django-admin.py test --settings=testapp.settings_with_south' '2' 'with south in installed apps'
++ django_test "$PYTHON /usr/bin/django-admin test --settings=testapp.settings_with_south" '2' 'with south in installed apps'
+ fi
+
+-django_test 'django-admin.py test --settings=testapp.settings_old_style' '2' 'django_nose.run_tests format'
+-django_test 'testapp/runtests.py testapp.test_only_this' '1' 'via run_tests API'
+-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 'django-admin.py test --settings=testapp.settings unittests --testrunner=testapp.custom_runner.CustomNoseTestSuiteRunner' '4' 'unittests'
++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'
++django_test "$PYTHON /usr/bin/django-admin test --settings=testapp.settings unittests" '4' 'unittests'
++django_test "$PYTHON /usr/bin/django-admin test --settings=testapp.settings unittests --testrunner=testapp.custom_runner.CustomNoseTestSuiteRunner" '4' 'unittests'
+ if ! [ $(version $PYTHONVERSION) \> $(version 3.0.0) ]
+ then
+ # Python 3 doesn't support the hotshot profiler. See nose#842.
+-django_test 'django-admin.py test --settings=testapp.settings --with-profile' '2' 'with profile plugin'
++django_test "$PYTHON /usr/bin/django-admin test --settings=testapp.settings --with-profile" '2' 'with profile plugin'
+ fi
Deleted: packages/django-nose/tags/1.4-1/debian/rules
===================================================================
--- packages/django-nose/trunk/debian/rules 2015-04-03 07:10:31 UTC (rev 32162)
+++ packages/django-nose/tags/1.4-1/debian/rules 2015-05-19 07:38:49 UTC (rev 32693)
@@ -1,22 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-
-export PYBUILD_NAME=django-nose
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-%:
- dh $@ --with=python2,python3 --buildsystem=pybuild
-
-.PHONY: override_dh_auto_test
-override_dh_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
- set -e; \
- 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
Copied: packages/django-nose/tags/1.4-1/debian/rules (from rev 32690, packages/django-nose/trunk/debian/rules)
===================================================================
--- packages/django-nose/tags/1.4-1/debian/rules (rev 0)
+++ packages/django-nose/tags/1.4-1/debian/rules 2015-05-19 07:38:49 UTC (rev 32693)
@@ -0,0 +1,18 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+export PYBUILD_NAME=django-nose
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+ dh $@ --with=python2,python3 --buildsystem=pybuild
+
+override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ set -e; \
+ for python in $(shell pyversions -r) $(shell py3versions -r); do \
+ PYTHON=$$python ./runtests.sh; \
+ done
+endif
Deleted: packages/django-nose/tags/1.4-1/debian/watch
===================================================================
--- packages/django-nose/trunk/debian/watch 2015-04-03 07:10:31 UTC (rev 32162)
+++ packages/django-nose/tags/1.4-1/debian/watch 2015-05-19 07:38:49 UTC (rev 32693)
@@ -1,2 +0,0 @@
-version=3
-http://pypi.python.org/packages/source/d/django-nose/django-nose-([\d\.]+)\.tar\.gz
Copied: packages/django-nose/tags/1.4-1/debian/watch (from rev 32163, packages/django-nose/trunk/debian/watch)
===================================================================
--- packages/django-nose/tags/1.4-1/debian/watch (rev 0)
+++ packages/django-nose/tags/1.4-1/debian/watch 2015-05-19 07:38:49 UTC (rev 32693)
@@ -0,0 +1,5 @@
+version=3
+opts=filenamemangle=s/.+\/v([\d\.]+)\.tar\.gz/django-nose-$1.tar.gz/ \
+https://github.com/django-nose/django-nose/releases \
+/django-nose/django-nose/archive/v([\d\.]+)\.tar\.gz
+
More information about the Python-modules-commits
mailing list