[Python-modules-commits] [tox] 06/08: merge patched into master
Barry Warsaw
barry at moszumanska.debian.org
Wed Nov 16 20:48:56 UTC 2016
This is an automated email from the git hooks/post-receive script.
barry pushed a commit to branch master
in repository tox.
commit 26d7e8edc2d4b510fea28e2c07df852a6a9a7630
Merge: 7f58346 a9c5fea
Author: Barry Warsaw <barry at python.org>
Date: Wed Nov 16 15:40:48 2016 -0500
merge patched into master
CHANGELOG | 43 ++++++++++
CONTRIBUTORS | 2 +
PKG-INFO | 20 ++++-
README.rst | 11 +++
debian/.git-dpm | 6 +-
debian/patches/build-time-test-adjustments.patch | 16 ++--
debian/patches/de-google-ify.patch | 28 -------
debian/patches/hack-requires.patch | 6 +-
debian/patches/intersphinx-mapping.patch | 2 +-
debian/patches/series | 1 -
doc/_templates/indexsidebar.html | 21 -----
doc/_templates/layout.html | 6 --
doc/_templates/localtoc.html | 4 +-
doc/config.txt | 21 ++---
doc/drafts/tox_conda_notes_niccodemus.md | 11 ++-
doc/example/basic.txt | 12 +--
doc/example/jenkins.txt | 2 +
doc/install.txt | 2 +-
setup.py | 10 +--
tests/test_config.py | 63 ++++++++------
tests/test_venv.py | 45 +++-------
tests/test_z_cmdline.py | 101 ++++++++++++++++++++++-
tox.egg-info/PKG-INFO | 20 ++++-
tox.egg-info/SOURCES.txt | 2 -
tox.egg-info/requires.txt | 2 +-
tox.ini | 1 -
tox/__init__.py | 2 +-
tox/_pytestplugin.py | 3 +
tox/config.py | 51 ++++++------
tox/session.py | 19 +++--
tox/venv.py | 7 +-
31 files changed, 331 insertions(+), 209 deletions(-)
diff --cc debian/.git-dpm
index 679ed61,0000000..a83fad6
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
- 39bffc366ddc7e9c54a9d648d0c156f836704154
- 39bffc366ddc7e9c54a9d648d0c156f836704154
- ee9ae00dd3c2cbb80bad33797477c3d92fdda459
++a9c5fead59e513c20658630f2032b2633d3299ce
++a9c5fead59e513c20658630f2032b2633d3299ce
++8d36ef34abba11611396515cf27b3337bc1cfcb6
+8d36ef34abba11611396515cf27b3337bc1cfcb6
+tox_2.5.0.orig.tar.gz
+e5e58dc47d874621c6f9c694323a911ac601ea80
+114223
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/build-time-test-adjustments.patch
index 181d423,0000000..6849a96
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 d46e99f1f5d87c0d6a52dc4c034812558bd9c2ee Mon Sep 17 00:00:00 2001
++From a9c5fead59e513c20658630f2032b2633d3299ce 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 ef65564..3b56ff4 100644
++index febeecb..dd51a1f 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
- @@ -464,7 +465,7 @@ class TestToxRun:
++@@ -497,7 +498,7 @@ class TestToxRun:
+ changedir=tests
+ commands= py.test --basetemp={envtmpdir} \
+ --junitxml=junit-{envname}.xml
+- deps=pytest
++ sitepackages=True
+ '''
+ })
+
- @@ -511,6 +512,7 @@ class TestToxRun:
++@@ -544,6 +545,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': """
- """})
- @@ -562,7 +564,7 @@ def test_test_usedevelop(cmd, initproj):
++ [testenv]
++@@ -600,7 +602,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")
- @@ -602,6 +604,7 @@ def test_test_usedevelop(cmd, initproj):
++@@ -640,6 +642,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 a2bbd96..88f07da 100644
++index f6d9d52..67533eb 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/hack-requires.patch
index dd2de14,0000000..5f17a15
mode 100644,000000..100644
--- a/debian/patches/hack-requires.patch
+++ b/debian/patches/hack-requires.patch
@@@ -1,24 -1,0 +1,24 @@@
- From aaaa309be578a420f9ee61ebbaffd8559842d1c1 Mon Sep 17 00:00:00 2001
++From 885c37ebb712737ddd44139fe751ca0bf29dcbea 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 c75bfbb..c8dbaa5 100644
++index d1c8e7c..49bde4a 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.5.0
++ pluggy>=0.3.0,<1.0
+
diff --cc debian/patches/intersphinx-mapping.patch
index d333c79,0000000..c61bacb
mode 100644,000000..100644
--- a/debian/patches/intersphinx-mapping.patch
+++ b/debian/patches/intersphinx-mapping.patch
@@@ -1,47 -1,0 +1,47 @@@
- From a8faad3d1a87bfb1a1194653bc64afa1a59fa99b Mon Sep 17 00:00:00 2001
++From 133bc7276b4d4d1a659f04b5bd39bdcddb64415b 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
diff --cc debian/patches/series
index 68e9bf1,0000000..b6e2fd5
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,0 +1,3 @@@
+intersphinx-mapping.patch
+hack-requires.patch
+build-time-test-adjustments.patch
- de-google-ify.patch
--
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