[Python-apps-commits] r9277 - in packages/tox/trunk/debian (5 files)

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

    Date: Wednesday, November 28, 2012 @ 20:10:44
  Author: warsaw-guest
Revision: 9277

* debian/patches/no-download.patch: Modify tox's own tox.ini file to
  prevent unintended downloads of dependencies from remote Python
  package servers.
* debian/control: Add B-D for python-pytest.
* debian/rules: Hack $PYTHONPATH to include the system Python's
  dist-packages when running tox's own tox test.  Without this, the
  system installed dependencies will not be found (since they aren't
  downloaded as per above).

Added:
  packages/tox/trunk/debian/patches/no-download.patch
Modified:
  packages/tox/trunk/debian/changelog
  packages/tox/trunk/debian/control
  packages/tox/trunk/debian/patches/series
  packages/tox/trunk/debian/rules

Modified: packages/tox/trunk/debian/changelog
===================================================================
--- packages/tox/trunk/debian/changelog	2012-11-27 23:02:26 UTC (rev 9276)
+++ packages/tox/trunk/debian/changelog	2012-11-28 20:10:44 UTC (rev 9277)
@@ -1,5 +1,18 @@
-tox (1.4.2-1) UNRELEASED; urgency=low
+tox (1.4.2-2) unstable; urgency=low
 
+  * debian/patches/no-download.patch: Modify tox's own tox.ini file to
+    prevent unintended downloads of dependencies from remote Python
+    package servers.
+  * debian/control: Add B-D for python-pytest.
+  * debian/rules: Hack $PYTHONPATH to include the system Python's
+    dist-packages when running tox's own tox test.  Without this, the
+    system installed dependencies will not be found (since they aren't
+    downloaded as per above).
+
+ -- Barry Warsaw <barry at python.org>  Wed, 28 Nov 2012 14:59:23 -0500
+
+tox (1.4.2-1) unstable; urgency=low
+
   * Initial release. (Closes: #664759)
 
  -- Barry Warsaw <barry at python.org>  Fri, 09 Nov 2012 18:07:19 -0500

Modified: packages/tox/trunk/debian/control
===================================================================
--- packages/tox/trunk/debian/control	2012-11-27 23:02:26 UTC (rev 9276)
+++ packages/tox/trunk/debian/control	2012-11-28 20:10:44 UTC (rev 9277)
@@ -10,6 +10,7 @@
                python-doc,
                python-pkg-resources,
                python-py,
+	       python-pytest,
                python-setuptools,
                python-sphinx (>= 1.0.7+dfsg),
                python-virtualenv

Added: packages/tox/trunk/debian/patches/no-download.patch
===================================================================
--- packages/tox/trunk/debian/patches/no-download.patch	                        (rev 0)
+++ packages/tox/trunk/debian/patches/no-download.patch	2012-11-28 20:10:44 UTC (rev 9277)
@@ -0,0 +1,28 @@
+Description: Prevent internet access when running tox's own tests.
+Author: Barry Warsaw <barry at python.org>
+Forwarded: not-needed
+
+--- a/tox.ini
++++ b/tox.ini
+@@ -1,16 +1,17 @@
+ [tox]
+ envlist=py27,py26,py25,py31,py32,docs
++sitepackages=True
+ indexserver =
+-    testrun = http://pypi.testrun.org
+-    pypi = http://pypi.python.org/simple
++    testrun = http://missing.example.com
++    pypi = http://missing.example.com
++    default = http://missing.example.com
+ 
+ [testenv:X]
+ commands=echo {posargs}
+ 
+ [testenv]
+ commands=py.test --junitxml={envlogdir}/junit-{envname}.xml {posargs}
+-deps=pytest
+-     py
++deps=
+ 
+ [testenv:docs]
+ basepython=python

Modified: packages/tox/trunk/debian/patches/series
===================================================================
--- packages/tox/trunk/debian/patches/series	2012-11-27 23:02:26 UTC (rev 9276)
+++ packages/tox/trunk/debian/patches/series	2012-11-28 20:10:44 UTC (rev 9277)
@@ -2,3 +2,4 @@
 fix-doctree.patch
 upstream-issue58.patch
 test-problems.patch
+no-download.patch

Modified: packages/tox/trunk/debian/rules
===================================================================
--- packages/tox/trunk/debian/rules	2012-11-27 23:02:26 UTC (rev 9276)
+++ packages/tox/trunk/debian/rules	2012-11-28 20:10:44 UTC (rev 9277)
@@ -34,7 +34,9 @@
 # run it out of the built location), invoke the main() function explicitly.
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 test-python%:
-	HOME=$(FAKEHOME) python$* -c 'from tox._cmdline import main; main(["-e", "py"+"$*".replace(".", "")])'
+	HOME=$(FAKEHOME) \
+	PYTHONPATH=.:/usr/lib/python$*/dist-packages \
+	python$* -c 'from tox._cmdline import main; main(["-e", "py"+"$*".replace(".", "")])'
 
 override_dh_auto_test: $(PYTHON2:%=test-python%) $(PYTHON3:%=test-python%)
 endif