[Python-modules-commits] [tox] 07/15: merge patched into master
Barry Warsaw
barry at moszumanska.debian.org
Fri Nov 20 21:45:19 UTC 2015
This is an automated email from the git hooks/post-receive script.
barry pushed a commit to branch master
in repository tox.
commit 75c834a33c3e61ddaf8d379c41c5fc8f82fdba1c
Merge: 4ce29cb 38cf556
Author: Barry Warsaw <barry at ubuntu.com>
Date: Fri Nov 20 16:11:21 2015 -0500
merge patched into master
CHANGELOG | 31 ++++++++
CONTRIBUTORS | 1 +
PKG-INFO | 2 +-
debian/.git-dpm | 6 +-
debian/patches/build-time-test-adjustments.patch | 4 +-
debian/patches/de-google-ify.patch | 2 +-
debian/patches/hack-requires.patch | 2 +-
debian/patches/intersphinx-mapping.patch | 4 +-
doc/conf.py | 4 +-
doc/config.txt | 9 +++
setup.cfg | 11 +++
setup.py | 2 +-
tests/test_config.py | 90 ++++++++++++++++++++++++
tests/test_venv.py | 15 ++++
tests/test_z_cmdline.py | 19 ++++-
tox.egg-info/PKG-INFO | 2 +-
tox/__init__.py | 2 +-
tox/config.py | 57 +++++++++------
tox/session.py | 3 +
tox/venv.py | 7 ++
20 files changed, 233 insertions(+), 40 deletions(-)
diff --cc debian/.git-dpm
index efb0148,0000000..255abf5
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- a1a074545124a83564dde0ebacf66b81b5e6dacb
- a1a074545124a83564dde0ebacf66b81b5e6dacb
- 6e320b49d2b82f58d78631a1881c4f13f0a3e72e
++38cf5567bda67c5e11445d890531f2e94e5c6806
++38cf5567bda67c5e11445d890531f2e94e5c6806
++af0fa1138402eb639d11846a51733fab2b04ce53
+af0fa1138402eb639d11846a51733fab2b04ce53
+tox_2.2.1.orig.tar.gz
+16fb13e933353912c4af92be170f99c3532fc82a
+104115
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/build-time-test-adjustments.patch
index b6798c6,0000000..0fa2356
mode 100644,000000..100644
--- a/debian/patches/build-time-test-adjustments.patch
+++ b/debian/patches/build-time-test-adjustments.patch
@@@ -1,79 -1,0 +1,79 @@@
- From df9aeea21a177f2e4f1c3c73d1d7a6e750d4e7c9 Mon Sep 17 00:00:00 2001
++From 6b7e6a70b3e0458548f8839ee58c3434919fc589 Mon Sep 17 00:00:00 2001
+From: Barry Warsaw <barry at debian.org>
+Date: Sat, 21 Jun 2014 18:44:45 -0400
+Subject: Skip some tests at build time, fix others.
+
+ Some of tox's unit tests require tox to be already built and installed. This
+ is a catch 22, and such tests can't pass at package build time. These are
+ disabled by adding a decorator that skips the test when an environment
+ variable is set. debian/rules sets this envar. The DEP-8 tests do not set
+ this envar and therefore run the full test suite.
+
+ A few other tests just need some tweaks during package build, e.g. to use the
+ system packages rather than trying to download them from PyPI.
+
+ This also tweaks the tox.ini to use Debian's Python 3 py.test executable.
+
+Patch-Name: build-time-test-adjustments.patch
+---
+ tests/test_z_cmdline.py | 7 +++++--
+ tox.ini | 3 ++-
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/tests/test_z_cmdline.py b/tests/test_z_cmdline.py
- index b288880..cc6deb7 100644
++index 994d4ec..535e5a4 100644
+--- a/tests/test_z_cmdline.py
++++ b/tests/test_z_cmdline.py
+@@ -1,3 +1,4 @@
++import os
+ import tox
+ import py
+ import pytest
+@@ -431,7 +432,7 @@ class TestToxRun:
+ changedir=tests
+ commands= py.test --basetemp={envtmpdir} \
+ --junitxml=junit-{envname}.xml
+- deps=pytest
++ sitepackages=True
+ '''
+ })
+
+@@ -478,6 +479,7 @@ class TestToxRun:
+ ])
+
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'), reason='Use DEP-8')
+ def test_develop(initproj, cmd):
+ initproj("example123", filedefs={'tox.ini': """
+ """})
+@@ -529,7 +531,7 @@ def test_test_usedevelop(cmd, initproj):
+ changedir=tests
+ commands=
+ py.test --basetemp={envtmpdir} --junitxml=junit-{envname}.xml []
+- deps=pytest
++ sitepackages=True
+ '''
+ })
+ result = cmd.run("tox", "-v")
+@@ -569,6 +571,7 @@ def test_test_usedevelop(cmd, initproj):
+ ])
+
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'), reason='Use DEP-8')
+ def test_test_piphelp(initproj, cmd):
+ initproj("example123", filedefs={'tox.ini': """
+ # content of: tox.ini
+diff --git a/tox.ini b/tox.ini
+index d78bcbd..3658fff 100644
+--- a/tox.ini
++++ b/tox.ini
+@@ -5,7 +5,8 @@ envlist=py27,py26,py34,py33,pypy,flakes,py26-bare
+ commands=echo {posargs}
+
+ [testenv]
+-commands= py.test --timeout=180 {posargs}
++commands= py.test-3 --timeout=180 {posargs}
++whitelist_externals: py.test-3
+
+ deps=pytest>=2.3.5
+ pytest-timeout
diff --cc debian/patches/de-google-ify.patch
index eaf6ecf,0000000..cdc04ab
mode 100644,000000..100644
--- a/debian/patches/de-google-ify.patch
+++ b/debian/patches/de-google-ify.patch
@@@ -1,28 -1,0 +1,28 @@@
- From a1a074545124a83564dde0ebacf66b81b5e6dacb Mon Sep 17 00:00:00 2001
++From 38cf5567bda67c5e11445d890531f2e94e5c6806 Mon Sep 17 00:00:00 2001
+From: Barry Warsaw <barry at debian.org>
+Date: Sat, 21 Jun 2014 18:44:45 -0400
+Subject: de-google-ify
+
+Patch-Name: de-google-ify.patch
+---
+ doc/_templates/layout.html | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
+index 1892483..66e6fdd 100644
+--- a/doc/_templates/layout.html
++++ b/doc/_templates/layout.html
+@@ -3,13 +3,4 @@
+
+ {% block footer %}
+ {{ super() }}
+-<script type="text/javascript">
+-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+-</script>
+-<script type="text/javascript">
+-try {
+-var pageTracker = _gat._getTracker("UA-17241637-3");
+-pageTracker._trackPageview();
+-} catch(err) {}</script>
+ {% endblock %}
diff --cc debian/patches/hack-requires.patch
index 451533c,0000000..64c4c1c
mode 100644,000000..100644
--- a/debian/patches/hack-requires.patch
+++ b/debian/patches/hack-requires.patch
@@@ -1,24 -1,0 +1,24 @@@
- From 230b1e43f0e0da69e72f76f57dd2d271614baed3 Mon Sep 17 00:00:00 2001
++From 6c4667e188236979924933f1ab7f7234240cd977 Mon Sep 17 00:00:00 2001
+From: Barry Warsaw <barry at debian.org>
+Date: Tue, 17 Jun 2014 16:05:44 -0400
+Subject: Remove the virtualenv versioned requirements.
+
+ We'll ensure that the proper dependencies are available via Depends, but
+ the requires.txt line tries to do an import to verify the requirement, and
+ we don't build the Python 3 version of virtualenv yet.
+Forwarded: not-needed
+
+Patch-Name: hack-requires.patch
+---
+ tox.egg-info/requires.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/tox.egg-info/requires.txt b/tox.egg-info/requires.txt
+index a1ef299..a63bc74 100644
+--- a/tox.egg-info/requires.txt
++++ b/tox.egg-info/requires.txt
+@@ -1,4 +1,3 @@
+-virtualenv>=1.11.2
+ py>=1.4.17
+ pluggy>=0.3.0,<0.4.0
+
diff --cc debian/patches/intersphinx-mapping.patch
index 1c9c705,0000000..87a1710
mode 100644,000000..100644
--- a/debian/patches/intersphinx-mapping.patch
+++ b/debian/patches/intersphinx-mapping.patch
@@@ -1,47 -1,0 +1,47 @@@
- From 45ddbb723b83af5ba180745b054ee067ec2be14a Mon Sep 17 00:00:00 2001
++From dfa189b7dbd3d90186237d343041ac384ed7cd19 Mon Sep 17 00:00:00 2001
+From: Fladischer Michael <FladischerMichael at fladi.at>
+Date: Tue, 17 Jun 2014 16:05:44 -0400
+Subject: Use local object inventory files for sphinx
+
+ Use the local object inventory files to prevent sphinx-build from
+ downloading them during build.
+ This patch makes the intersphinx mappings depend on the existence of
+ these files, thus passing Debian Policy 12.3 while still maintaining
+ a level of comfort for the reader of the documentation.
+Forwarded: not-needed
+Last-Update: 2011-03-03
+
+Patch-Name: intersphinx-mapping.patch
+---
+ doc/conf.py | 18 +++++++++++++++++-
+ 1 file changed, 17 insertions(+), 1 deletion(-)
+
+diff --git a/doc/conf.py b/doc/conf.py
- index 630cb80..589c108 100644
++index 79857d7..8ecf75d 100644
+--- a/doc/conf.py
++++ b/doc/conf.py
+@@ -254,7 +254,23 @@ epub_copyright = u'2010, holger krekel'
+
+
+ # Example configuration for intersphinx: refer to the Python standard library.
+-intersphinx_mapping = {'http://docs.python.org/': None}
++def check_object_path(key, url, path):
++ if os.path.isfile(path):
++ return {key: (url, path)}
++ return {}
++
++intersphinx_mapping = {}
++intersphinx_mapping.update(
++ check_object_path('python',
++ 'http://docs.python.org/',
++ '/usr/share/doc/python'
++ + '.'.join([str(x) for x in sys.version_info[0:2]])
++ + '/html/objects.inv'))
++intersphinx_mapping.update(
++ check_object_path('sphinx',
++ 'http://sphinx.pocoo.org/',
++ '/usr/share/doc/python-sphinx/html/objects.inv'))
++
+
+ def setup(app):
+ #from sphinx.ext.autodoc import cut_lines
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/tox.git
More information about the Python-modules-commits
mailing list