[Python-modules-commits] r25694 - in packages/nose2/trunk/debian (5 files)

[barry at users.alioth.debian.org]

    Date: Wednesday, August 28, 2013 @ 14:33:06
  Author: barry
Revision: 25694

Produce a buildable package.

Added:
  packages/nose2/trunk/debian/patches/requirements.patch
Modified:
  packages/nose2/trunk/debian/control
  packages/nose2/trunk/debian/patches/series
  packages/nose2/trunk/debian/rules
Deleted:
  packages/nose2/trunk/debian/patches/setup-py-reqs.patch

Modified: packages/nose2/trunk/debian/control
===================================================================
--- packages/nose2/trunk/debian/control	2013-08-28 14:30:01 UTC (rev 25693)
+++ packages/nose2/trunk/debian/control	2013-08-28 14:33:06 UTC (rev 25694)
@@ -9,7 +9,6 @@
                python-setuptools,
                python-six,
                python-tox,
-               python-unittest2,
                python3-all,
                python3-setuptools,
                python3-six

Added: packages/nose2/trunk/debian/patches/requirements.patch
===================================================================
--- packages/nose2/trunk/debian/patches/requirements.patch	                        (rev 0)
+++ packages/nose2/trunk/debian/patches/requirements.patch	2013-08-28 14:33:06 UTC (rev 25694)
@@ -0,0 +1,20 @@
+Description: Disable some broken settings in setup.py.
+ - Don't try to install requirements from PyPI.
+ - A bug in nose2 prevents the use of `python setup.py test`
+Author: Barry Warsaw <barry at debian.org>
+Forwarded: not-needed
+
+--- a/setup.py
++++ b/setup.py
+@@ -69,7 +69,9 @@
+             '%s = nose2:discover' % SCRIPT2,
+         ],
+     }
+-    params['install_requires'] = REQS
+-    params['test_suite'] = 'nose2.compat.unittest.collector'
++    # DEBIAN: don't try to install requirements from PyPI.
++    #params['install_requires'] = REQS
++    # DEBIAN: https://github.com/nose-devs/nose2/issues/118
++    #params['test_suite'] = 'nose2.compat.unittest.collector'
+ 
+ setup(**params)

Modified: packages/nose2/trunk/debian/patches/series
===================================================================
--- packages/nose2/trunk/debian/patches/series	2013-08-28 14:30:01 UTC (rev 25693)
+++ packages/nose2/trunk/debian/patches/series	2013-08-28 14:33:06 UTC (rev 25694)
@@ -1 +1 @@
-setup-py-reqs.patch
+requirements.patch

Deleted: packages/nose2/trunk/debian/patches/setup-py-reqs.patch
===================================================================
--- packages/nose2/trunk/debian/patches/setup-py-reqs.patch	2013-08-28 14:30:01 UTC (rev 25693)
+++ packages/nose2/trunk/debian/patches/setup-py-reqs.patch	2013-08-28 14:33:06 UTC (rev 25694)
@@ -1,42 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -69,7 +69,7 @@
-             '%s = nose2:discover' % SCRIPT2,
-         ],
-     }
--    params['install_requires'] = REQS
-+    #params['install_requires'] = REQS
-     params['test_suite'] = 'nose2.compat.unittest.collector'
- 
- setup(**params)
---- a/tox.ini
-+++ b/tox.ini
-@@ -24,6 +24,7 @@
- deps=-r{toxinidir}/requirements.txt
-      -r{toxinidir}/requirements-docs.txt
- commands=python -m unittest discover []
-+sitepackages=True
- 
- [testenv:py32]
- deps=-r{toxinidir}/requirements.txt
-@@ -34,6 +35,7 @@
- deps=-r{toxinidir}/requirements.txt
-      -r{toxinidir}/requirements-docs.txt
- commands=python -m unittest discover []
-+sitepackages=True
- 
- [testenv:self26]
- deps=-r{toxinidir}/requirements.txt
---- a/requirements-docs.txt
-+++ /dev/null
-@@ -1 +0,0 @@
--Sphinx>=1.0.5
---- a/requirements-py26.txt
-+++ /dev/null
-@@ -1,2 +0,0 @@
--unittest2==0.5.1
--argparse>=1.2.1
---- a/requirements.txt
-+++ /dev/null
-@@ -1 +0,0 @@
--six>=1.1,<1.4

Modified: packages/nose2/trunk/debian/rules
===================================================================
--- packages/nose2/trunk/debian/rules	2013-08-28 14:30:01 UTC (rev 25693)
+++ packages/nose2/trunk/debian/rules	2013-08-28 14:33:06 UTC (rev 25694)
@@ -1,15 +1,16 @@
 #!/usr/bin/make -f
 
-DH_VERBOSE=1
+#DH_VERBOSE=1
 
+# This doesn't work yet.
+#export PYBUILD_NAME=nose2
+export PYBUILD_DESTDIR_python2=debian/python-nose2
+export PYBUILD_DESTDIR_python3=debian/python3-nose2
+
+
 # Prevent setuptools/distribute from accessing the internet.
 export http_proxy = http://127.0.9.1:9
 export https_proxy = https://127.0.9.1:9
 
 %:
 	dh $@ --with python2,python3 --buildsystem=pybuild
-
-override_dh_auto_test:
-	HOME={home_dir} \
-	PYBUILD_SYSTEM=custom \
-	PYBUILD_TEST_ARGS="tox -e py27,py33" dh_auto_test