[Python-modules-commits] r30146 - in packages/django-nose/tags (9 files)
bam at users.alioth.debian.org
bam at users.alioth.debian.org
Wed Aug 13 03:38:55 UTC 2014
Date: Wednesday, August 13, 2014 @ 03:38:54
Author: bam
Revision: 30146
[svn-buildpackage] Tagging django-nose 1.2-2
Added:
packages/django-nose/tags/1.2-2/
packages/django-nose/tags/1.2-2/debian/changelog
(from rev 30145, packages/django-nose/trunk/debian/changelog)
packages/django-nose/tags/1.2-2/debian/control
(from rev 30145, packages/django-nose/trunk/debian/control)
packages/django-nose/tags/1.2-2/debian/patches/runtests.patch
(from rev 30145, packages/django-nose/trunk/debian/patches/runtests.patch)
packages/django-nose/tags/1.2-2/debian/rules
(from rev 30145, packages/django-nose/trunk/debian/rules)
Deleted:
packages/django-nose/tags/1.2-2/debian/changelog
packages/django-nose/tags/1.2-2/debian/control
packages/django-nose/tags/1.2-2/debian/patches/runtests.patch
packages/django-nose/tags/1.2-2/debian/rules
Deleted: packages/django-nose/tags/1.2-2/debian/changelog
===================================================================
--- packages/django-nose/trunk/debian/changelog 2014-08-13 03:02:16 UTC (rev 30144)
+++ packages/django-nose/tags/1.2-2/debian/changelog 2014-08-13 03:38:54 UTC (rev 30146)
@@ -1,77 +0,0 @@
-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.2-2/debian/changelog (from rev 30145, packages/django-nose/trunk/debian/changelog)
===================================================================
--- packages/django-nose/tags/1.2-2/debian/changelog (rev 0)
+++ packages/django-nose/tags/1.2-2/debian/changelog 2014-08-13 03:38:54 UTC (rev 30146)
@@ -0,0 +1,84 @@
+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.2-2/debian/control
===================================================================
--- packages/django-nose/trunk/debian/control 2014-08-13 03:02:16 UTC (rev 30144)
+++ packages/django-nose/tags/1.2-2/debian/control 2014-08-13 03:38:54 UTC (rev 30146)
@@ -1,26 +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>
-Build-Depends: debhelper (>= 8.1.0~),
- dh-python,
- python-all,
- python-django,
- python-django-south,
- python-nose,
- python-setuptools
-Standards-Version: 3.9.5
-X-Python-Version: >= 2.5
-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).
Copied: packages/django-nose/tags/1.2-2/debian/control (from rev 30145, packages/django-nose/trunk/debian/control)
===================================================================
--- packages/django-nose/tags/1.2-2/debian/control (rev 0)
+++ packages/django-nose/tags/1.2-2/debian/control 2014-08-13 03:38:54 UTC (rev 30146)
@@ -0,0 +1,39 @@
+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.5
+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).
Deleted: packages/django-nose/tags/1.2-2/debian/patches/runtests.patch
===================================================================
--- packages/django-nose/trunk/debian/patches/runtests.patch 2014-08-13 03:02:16 UTC (rev 30144)
+++ packages/django-nose/tags/1.2-2/debian/patches/runtests.patch 2014-08-13 03:38:54 UTC (rev 30146)
@@ -1,37 +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
-
---- a/runtests.sh
-+++ b/runtests.sh
-@@ -1,6 +1,9 @@
- #!/bin/sh
-
- export PYTHONPATH=.
-+if [ -z $PYTHON ]; then
-+ export PYTHON=python
-+fi
-
- django_test() {
- TEST="$1"
-@@ -25,9 +28,8 @@
- 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_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'
Copied: packages/django-nose/tags/1.2-2/debian/patches/runtests.patch (from rev 30145, packages/django-nose/trunk/debian/patches/runtests.patch)
===================================================================
--- packages/django-nose/tags/1.2-2/debian/patches/runtests.patch (rev 0)
+++ packages/django-nose/tags/1.2-2/debian/patches/runtests.patch 2014-08-13 03:38:54 UTC (rev 30146)
@@ -0,0 +1,38 @@
+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'
Deleted: packages/django-nose/tags/1.2-2/debian/rules
===================================================================
--- packages/django-nose/trunk/debian/rules 2014-08-13 03:02:16 UTC (rev 30144)
+++ packages/django-nose/tags/1.2-2/debian/rules 2014-08-13 03:38:54 UTC (rev 30146)
@@ -1,22 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-%:
- dh $@ --with=python2
-
-.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
-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
Copied: packages/django-nose/tags/1.2-2/debian/rules (from rev 30145, packages/django-nose/trunk/debian/rules)
===================================================================
--- packages/django-nose/tags/1.2-2/debian/rules (rev 0)
+++ packages/django-nose/tags/1.2-2/debian/rules 2014-08-13 03:38:54 UTC (rev 30146)
@@ -0,0 +1,22 @@
+#!/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
More information about the Python-modules-commits
mailing list