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

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

    Date: Thursday, February 21, 2013 @ 15:13:41
  Author: mitya57-guest
Revision: 23529

[ Matthias Klose ]
Provide entry points for all supported Python 3 versions
(closes: #691455).

Added:
  packages/nose/trunk/debian/patches/entry-points
Modified:
  packages/nose/trunk/debian/changelog
  packages/nose/trunk/debian/patches/series
  packages/nose/trunk/debian/rules

Modified: packages/nose/trunk/debian/changelog
===================================================================
--- packages/nose/trunk/debian/changelog	2013-02-21 15:03:59 UTC (rev 23528)
+++ packages/nose/trunk/debian/changelog	2013-02-21 15:13:41 UTC (rev 23529)
@@ -1,5 +1,6 @@
 nose (1.3.0-1) UNRELEASED; urgency=low
 
+  [ Dmitry Shachnev ]
   * Team upload.
   * New upstream release (closes: #675554).
     - Fixes exceptions in tests generator (closes: #663465, thanks to
@@ -8,6 +9,10 @@
   * Disable some unstable tests (in multiprocessing module) to make the
     package not FTBFS.
 
+  [ Matthias Klose ]
+  * Provide entry points for all supported Python 3 versions
+    (closes: #691455).
+
  -- Dmitry Shachnev <mitya57 at gmail.com>  Thu, 21 Feb 2013 18:51:49 +0400
 
 nose (1.1.2-3) unstable; urgency=low

Added: packages/nose/trunk/debian/patches/entry-points
===================================================================
--- packages/nose/trunk/debian/patches/entry-points	                        (rev 0)
+++ packages/nose/trunk/debian/patches/entry-points	2013-02-21 15:13:41 UTC (rev 23529)
@@ -0,0 +1,35 @@
+Description: Provide entry points for all supported Python 3 versions
+Author: Matthias Klose <doko at debian.org>
+Forwarded: not-needed
+Last-Update: 2013-02-21
+
+--- a/setup.py
++++ b/setup.py
+@@ -24,17 +24,20 @@ else:
+ try:
+     from setup3lib import setup
+     from setuptools import find_packages
++    entry_points = ['nosetests = nose:run_exit']
++    commands = [' nosetests = nose.commands:nosetests']
++    if 'XPYVERS' in os.environ:
++        for version in os.environ['XPYVERS'].replace('python','').split():
++            entry_points.append('nosetests-%s = nose:run_exit' % version)
++            commands.append(' nosetests-%s = nose.commands:nosetests' % version)
++    else:
++        entry_points.append('nosetests%s = nose:run_exit' % py_vers_tag)
+     addl_args = dict(
+         zip_safe = False,
+         packages = find_packages(),
+         entry_points = {
+-        'console_scripts': [
+-            'nosetests = nose:run_exit',
+-            'nosetests%s = nose:run_exit' % py_vers_tag,
+-            ],
+-        'distutils.commands': [
+-            ' nosetests = nose.commands:nosetests',
+-            ],
++        'console_scripts': entry_points,
++        'distutils.commands': commands,
+         },
+         test_suite = 'nose.collector',
+         )

Modified: packages/nose/trunk/debian/patches/series
===================================================================
--- packages/nose/trunk/debian/patches/series	2013-02-21 15:03:59 UTC (rev 23528)
+++ packages/nose/trunk/debian/patches/series	2013-02-21 15:13:41 UTC (rev 23529)
@@ -3,3 +3,4 @@
 no-google-analytics
 no-distribute_setup
 disable-unstable-tests
+entry-points

Modified: packages/nose/trunk/debian/rules
===================================================================
--- packages/nose/trunk/debian/rules	2013-02-21 15:03:59 UTC (rev 23528)
+++ packages/nose/trunk/debian/rules	2013-02-21 15:13:41 UTC (rev 23529)
@@ -12,6 +12,10 @@
 override_dh_auto_build:
 	set -ex; \
 	for py in $(PYVERS) $(PY3VERS); do \
+		case $$py in \
+		python2*) export XPYVERS="$(PYVERS)";; \
+		python3*) export XPYVERS="$(PY3VERS)";; \
+		esac; \
 		$$py setup.py build; \
 	done
 	python setup.py build_sphinx
@@ -22,6 +26,10 @@
 	# yet
 	set -ex; \
 	for py in $(PYVERS); do \
+		case $$py in \
+		python2*) export XPYVERS="$(PYVERS)";; \
+		python3*) export XPYVERS="$(PY3VERS)";; \
+		esac; \
 		$$py setup.py test; \
 	done
 endif
@@ -32,16 +40,21 @@
 
 override_dh_auto_install:
 	set -ex; \
+	export XPYVERS="$(PYVERS)"; \
 	for py in $(PYVERS); do \
+		rm -rf nose.egg-info; \
 		$$py setup.py install --skip-build --root debian/python-nose \
 		                      --install-layout deb; \
 	done
 	sed -i -e 's,#!/usr/bin/python.*,#!/usr/bin/python,' $(DESTDIR2)/usr/bin/nosetests
 	set -ex; \
+	export XPYVERS="$(PY3VERS)"; \
 	for py in $(PY3VERS); do \
+		rm -rf nose.egg-info; \
 		$$py setup.py install --skip-build --root debian/python3-nose \
 		                      --install-layout deb; \
 	done
+	sed -i -e 's,#!/usr/bin/python.*,#!/usr/bin/python,' $(DESTDIR2)/usr/bin/nosetests
 	cd $(DESTDIR3)/usr/bin/ && mv nosetests nosetests3
 	sed -i -e 's,#!/usr/bin/python3.*,#!/usr/bin/python3,' $(DESTDIR3)/usr/bin/nosetests3