[Python-apps-commits] r9984 - in packages/tox/trunk/debian (8 files)

barry at users.alioth.debian.org barry at users.alioth.debian.org
Wed Aug 21 01:49:19 UTC 2013 

    Date: Wednesday, August 21, 2013 @ 01:49:16
  Author: barry
Revision: 9984

* New upstream release.
  - d/patches/test_fixes.patch: Added
  - d/patches/no-download.patch, d/copyright, d/manpage/conf.py:
    Update author email.

Added:
  packages/tox/trunk/debian/patches/test-fixes.patch
Modified:
  packages/tox/trunk/debian/changelog
  packages/tox/trunk/debian/control
  packages/tox/trunk/debian/copyright
  packages/tox/trunk/debian/manpage/conf.py
  packages/tox/trunk/debian/patches/no-download.patch
  packages/tox/trunk/debian/patches/series
Deleted:
  packages/tox/trunk/debian/patches/test-problems.patch

Modified: packages/tox/trunk/debian/changelog
===================================================================
--- packages/tox/trunk/debian/changelog	2013-08-20 16:09:26 UTC (rev 9983)
+++ packages/tox/trunk/debian/changelog	2013-08-21 01:49:16 UTC (rev 9984)
@@ -1,12 +1,15 @@
-tox (1.6.0-1) UNRELEASED; urgency=low
+tox (1.6.0-1) unstable; urgency=low
 
-  * new upstream release.
+  * New upstream release.
     - d/patches/upstream-issue58.patch: Removed; applied upstream.
     - d/patches/no-download.patch: Refreshed.
     - d/patches/pytest-dep-version.patch: Removed; no longer necessary.
     - d/patches/testenv-deps.patch: Added
+    - d/patches/test_fixes.patch: Added
+    - d/patches/no-download.patch, d/copyright, d/manpage/conf.py:
+      Update author email.
 
- -- Barry Warsaw <barry at debian.org>  Mon, 19 Aug 2013 15:42:14 -0400
+ -- Barry Warsaw <barry at debian.org>  Tue, 20 Aug 2013 21:48:05 -0400
 
 tox (1.5.0-1) unstable; urgency=low
 

Modified: packages/tox/trunk/debian/control
===================================================================
--- packages/tox/trunk/debian/control	2013-08-20 16:09:26 UTC (rev 9983)
+++ packages/tox/trunk/debian/control	2013-08-21 01:49:16 UTC (rev 9984)
@@ -10,7 +10,7 @@
                python-doc,
                python-pkg-resources,
                python-py,
-	       python-pytest,
+               python-pytest,
                python-setuptools,
                python-sphinx (>= 1.0.7+dfsg),
                python-virtualenv

Modified: packages/tox/trunk/debian/copyright
===================================================================
--- packages/tox/trunk/debian/copyright	2013-08-20 16:09:26 UTC (rev 9983)
+++ packages/tox/trunk/debian/copyright	2013-08-21 01:49:16 UTC (rev 9984)
@@ -21,7 +21,7 @@
 License: GPL-2+
 
 Files: debian/watch debian/tests/* files/manpage/*
-Copyright: 2012 Barry Warsaw <barry at python.org>
+Copyright: 2012 Barry Warsaw <barry at debian.org>
 License: GPL-2+
 
 License: GPL-2+

Modified: packages/tox/trunk/debian/manpage/conf.py
===================================================================
--- packages/tox/trunk/debian/manpage/conf.py	2013-08-20 16:09:26 UTC (rev 9983)
+++ packages/tox/trunk/debian/manpage/conf.py	2013-08-21 01:49:16 UTC (rev 9984)
@@ -215,7 +215,7 @@
 man_pages = [
     ('tox-man', 'tox', u'A generic virtualenv management and test tool.',
      [u'Holger Krekel <holger at merlinux.eu>',
-      u'Barry Warsaw <barry at python.org>'], 1)
+      u'Barry Warsaw <barry at debian.org>'], 1)
 ]
 
 # If true, show URL addresses after external links.

Modified: packages/tox/trunk/debian/patches/no-download.patch
===================================================================
--- packages/tox/trunk/debian/patches/no-download.patch	2013-08-20 16:09:26 UTC (rev 9983)
+++ packages/tox/trunk/debian/patches/no-download.patch	2013-08-21 01:49:16 UTC (rev 9984)
@@ -1,5 +1,5 @@
 Description: Prevent internet access when running tox's own tests.
-Author: Barry Warsaw <barry at python.org>
+Author: Barry Warsaw <barry at debian.org>
 Forwarded: not-needed
 
 --- a/tox.ini

Modified: packages/tox/trunk/debian/patches/series
===================================================================
--- packages/tox/trunk/debian/patches/series	2013-08-20 16:09:26 UTC (rev 9983)
+++ packages/tox/trunk/debian/patches/series	2013-08-21 01:49:16 UTC (rev 9984)
@@ -1,3 +1,4 @@
 intersphinx_mapping.patch
 no-download.patch
 testenv-deps.patch
+test-fixes.patch

Added: packages/tox/trunk/debian/patches/test-fixes.patch
===================================================================
--- packages/tox/trunk/debian/patches/test-fixes.patch	                        (rev 0)
+++ packages/tox/trunk/debian/patches/test-fixes.patch	2013-08-21 01:49:16 UTC (rev 9984)
@@ -0,0 +1,26 @@
+Description: Fix tests by using .realpath() on both sides of the assertion.
+Author: Barry Warsaw <barry at debian.org>
+Bug: https://bitbucket.org/hpk42/tox/issue/118/test-failures-in-a-debian-build
+
+--- a/tests/test_venv.py
++++ b/tests/test_venv.py
+@@ -25,7 +25,8 @@
+     venv = VirtualEnv(config.envconfigs['python'], session=mocksession)
+     interp = venv.getsupportedinterpreter()
+     # realpath needed for debian symlinks
+-    assert interp == py.path.local(sys.executable).realpath()
++    assert py.path.local(interp).realpath() \
++      == py.path.local(sys.executable).realpath()
+     monkeypatch.setattr(sys, 'platform', "win32")
+     monkeypatch.setattr(venv.envconfig, 'basepython', 'jython')
+     py.test.raises(tox.exception.UnsupportedInterpreter,
+@@ -51,7 +52,8 @@
+     assert "virtualenv" in str(args[1])
+     if sys.platform != "win32":
+         # realpath is needed for stuff like the debian symlinks
+-        assert py.path.local(sys.executable).realpath() == args[0]
++        assert py.path.local(sys.executable).realpath() \
++          == py.path.local(args[0]).realpath()
+         #assert Envconfig.toxworkdir in args
+         assert venv.getcommandpath("easy_install", cwd=py.path.local())
+     interp = venv._getliveconfig().python

Deleted: packages/tox/trunk/debian/patches/test-problems.patch
===================================================================
--- packages/tox/trunk/debian/patches/test-problems.patch	2013-08-20 16:09:26 UTC (rev 9983)
+++ packages/tox/trunk/debian/patches/test-problems.patch	2013-08-21 01:49:16 UTC (rev 9984)
@@ -1,30 +0,0 @@
-Description: Fix various problems in the test suite, which become evident in
- an sbuild and other builder environments. 
- + In an sbuild environment, $USER will not match $HOME.
- + argv[0] should not contribute to test string.
-Author: Barry Warsaw <barry at python.org>
-Bug: https://bitbucket.org/hpk42/tox/issue/60/home-does-not-always-equal-user
-Bug: https://bitbucket.org/hpk42/tox/issue/61/test-incorrectly-includes-argv-0
-
---- a/tests/test_config.py
-+++ b/tests/test_config.py
-@@ -429,7 +429,7 @@
-         assert argv[3][0] == conf.envbindir
-         assert argv[4][0] == conf.envtmpdir
-         assert argv[5][0] == conf.envpython
--        assert argv[6][0] == os.path.expanduser("~")
-+        assert argv[6][0] == os.environ['HOME']
-         assert argv[7][0] == config.homedir.join(".tox", "distshare")
-         assert argv[8][0] == conf.envlogdir
- 
---- a/tests/test_venv.py
-+++ b/tests/test_venv.py
-@@ -189,7 +189,7 @@
-     venv.install_deps()
-     # two different index servers, two calls
-     assert len(l) == 2
--    args = " ".join(l[0].args)
-+    args = " ".join(l[0].args[1:])
-     assert "-i" not in args
-     assert "dep1" in args
-

More information about the Python-apps-commits mailing list