[Python-modules-commits] [tox] 07/08: merge patched into master
Barry Warsaw
barry at moszumanska.debian.org
Mon Dec 14 14:49:46 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 f1622b83d9927969da4170351d81e3b31a2d9260
Merge: 768a299 4054fad
Author: Barry Warsaw <barry at ubuntu.com>
Date: Mon Dec 14 09:41:02 2015 -0500
merge patched into master
CHANGELOG | 5 ++++
PKG-INFO | 2 +-
debian/.git-dpm | 6 ++---
debian/patches/build-time-test-adjustments.patch | 2 +-
debian/patches/de-google-ify.patch | 2 +-
debian/patches/hack-requires.patch | 2 +-
debian/patches/intersphinx-mapping.patch | 2 +-
setup.py | 2 +-
tests/test_config.py | 33 ++++++++++++++++++++++--
tox.egg-info/PKG-INFO | 2 +-
tox/__init__.py | 2 +-
tox/config.py | 27 ++++++++++++-------
12 files changed, 64 insertions(+), 23 deletions(-)
diff --cc debian/.git-dpm
index 7c501db,0000000..53bc537
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
- 64e3d010a0c8efec1cbc0fc75a7ac60cf8068c05
- 64e3d010a0c8efec1cbc0fc75a7ac60cf8068c05
- f378d898feb0b884114c2cd311221527b157c7bb
++4054fad2abdbc5c8b4d69997485ca803af1c3385
++4054fad2abdbc5c8b4d69997485ca803af1c3385
++f66145629f6c37fb6d04eebd772b68cad550a0a1
+f66145629f6c37fb6d04eebd772b68cad550a0a1
+tox_2.3.1.orig.tar.gz
+decd288f566717d7cee7917695145fb53e14d03d
+106447
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/build-time-test-adjustments.patch
index dcb0e71,0000000..a6dde58
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 8c048660f221ad89273f170ad6561cd97365d251 Mon Sep 17 00:00:00 2001
++From b650e93edaa4cea78798aabc09e0cc9b1c2d3eab 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 a98d211..61e0227 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
+@@ -449,7 +450,7 @@ class TestToxRun:
+ changedir=tests
+ commands= py.test --basetemp={envtmpdir} \
+ --junitxml=junit-{envname}.xml
+- deps=pytest
++ sitepackages=True
+ '''
+ })
+
+@@ -496,6 +497,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': """
+ """})
+@@ -547,7 +549,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")
+@@ -587,6 +589,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 17efc83..67b578b 100644
+--- a/tox.ini
++++ b/tox.ini
+@@ -5,7 +5,8 @@ envlist=py27,py26,py34,py33,py35,pypy,flakes,py26-bare
+ commands=echo {posargs}
+
+ [testenv]
+-commands= py.test --timeout=180 {posargs:tests}
++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 bef4473,0000000..cc78ceb
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 64e3d010a0c8efec1cbc0fc75a7ac60cf8068c05 Mon Sep 17 00:00:00 2001
++From 4054fad2abdbc5c8b4d69997485ca803af1c3385 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 303c5cc,0000000..eb5536a
mode 100644,000000..100644
--- a/debian/patches/hack-requires.patch
+++ b/debian/patches/hack-requires.patch
@@@ -1,24 -1,0 +1,24 @@@
- From 33cd3d2157af327740c957dbaf24f4c85d82fc18 Mon Sep 17 00:00:00 2001
++From 38419f7f03d5d2d5dbf64da41e96d249f9f094c3 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 10697fe,0000000..6943110
mode 100644,000000..100644
--- a/debian/patches/intersphinx-mapping.patch
+++ b/debian/patches/intersphinx-mapping.patch
@@@ -1,47 -1,0 +1,47 @@@
- From f5aeaef4e31531d1afbe9aa59ba9e8f4d3a016f8 Mon Sep 17 00:00:00 2001
++From 4808ba904996256b26a81c40fe1433f940bca7fb 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 6094f60..c9b1661 100644
+--- a/doc/conf.py
++++ b/doc/conf.py
+@@ -258,7 +258,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