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

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

    Date: Monday, March 4, 2013 @ 11:37:39
  Author: mitya57-guest
Revision: 23648

Revert r23529 ("Provide entry points for all supported Python 3 versions")

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

Modified: packages/nose/trunk/debian/changelog
===================================================================
--- packages/nose/trunk/debian/changelog	2013-03-04 11:00:43 UTC (rev 23647)
+++ packages/nose/trunk/debian/changelog	2013-03-04 11:37:39 UTC (rev 23648)
@@ -10,10 +10,6 @@
     package not FTBFS.
   * Run the tests for Python 3.x during build.
 
-  [ Matthias Klose ]
-  * Provide entry points for all supported Python 3 versions
-    (closes: #691455).
-
   [ Charlie Smotherman ]
   * Removed myself from uploaders in debian/control
 

Deleted: packages/nose/trunk/debian/patches/entry-points
===================================================================
--- packages/nose/trunk/debian/patches/entry-points	2013-03-04 11:00:43 UTC (rev 23647)
+++ packages/nose/trunk/debian/patches/entry-points	2013-03-04 11:37:39 UTC (rev 23648)
@@ -1,35 +0,0 @@
-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-03-04 11:00:43 UTC (rev 23647)
+++ packages/nose/trunk/debian/patches/series	2013-03-04 11:37:39 UTC (rev 23648)
@@ -3,4 +3,3 @@
 no-google-analytics
 no-distribute_setup
 disable-unstable-tests
-entry-points

Modified: packages/nose/trunk/debian/rules
===================================================================
--- packages/nose/trunk/debian/rules	2013-03-04 11:00:43 UTC (rev 23647)
+++ packages/nose/trunk/debian/rules	2013-03-04 11:37:39 UTC (rev 23648)
@@ -12,10 +12,6 @@
 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
@@ -24,11 +20,9 @@
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	set -ex; \
 	for py in $(PYVERS); do \
-		export XPYVERS="$(PYVERS)"; \
 		$$py setup.py test; \
 	done
 	for py in $(PY3VERS); do \
-		export XPY3VERS="$(PY3VERS)"; \
 		$$py setup.py build_tests; \
 		$$py selftest.py -v; \
 	done
@@ -40,7 +34,6 @@
 
 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 \
@@ -48,7 +41,6 @@
 	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 \