[Python-modules-commits] [tox] 07/08: merge patched into master
Barry Warsaw
barry at moszumanska.debian.org
Fri Sep 26 20:57:16 UTC 2014
This is an automated email from the git hooks/post-receive script.
barry pushed a commit to branch master
in repository tox.
commit 4f505f87ff90b0f98dcc1af18316f28f3e638d76
Merge: 70a71fa 6d1cb85
Author: Barry Warsaw <barry at python.org>
Date: Fri Sep 26 16:46:27 2014 -0400
merge patched into master
CHANGELOG | 17 +++
CONTRIBUTORS | 1 +
PKG-INFO | 2 +-
debian/.git-dpm | 6 +-
debian/patches/build-time-test-adjustments.patch | 10 +-
debian/patches/de-google-ify.patch | 2 +-
debian/patches/hack-requires.patch | 4 +-
debian/patches/intersphinx-mapping.patch | 6 +-
doc/announce/release-1.8.txt | 54 ++++++++
doc/conf.py | 3 +-
doc/config.txt | 146 ++++++++++++++++++++
doc/example/basic.txt | 1 +
setup.py | 2 +-
tests/test_config.py | 82 +++++++++++
tests/test_venv.py | 12 +-
tox.egg-info/PKG-INFO | 2 +-
tox.egg-info/SOURCES.txt | 1 +
tox/__init__.py | 2 +-
tox/_config.py | 168 ++++++++++++++---------
tox/_venv.py | 15 +-
20 files changed, 448 insertions(+), 88 deletions(-)
diff --cc debian/.git-dpm
index 476d877,0000000..2679214
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
+# see git-dpm(1) from git-dpm package
- 592f75b4fe1b97500eff4945261591cf032815df
- 592f75b4fe1b97500eff4945261591cf032815df
- 3a2a218f1d633f16ab8874da292a70aaa8ff6d28
++6d1cb85ba424a0ac37adea2bf82a75eb8c7b4e34
++6d1cb85ba424a0ac37adea2bf82a75eb8c7b4e34
++efccfc7dd538b6608af4f4d9eac581422490cea0
+efccfc7dd538b6608af4f4d9eac581422490cea0
+tox_1.8.0.orig.tar.gz
+e31d004b43c82b5ae17218271a8fc96a28d00385
+89667
diff --cc debian/patches/build-time-test-adjustments.patch
index ab8fabe,0000000..d051cf7
mode 100644,000000..100644
--- a/debian/patches/build-time-test-adjustments.patch
+++ b/debian/patches/build-time-test-adjustments.patch
@@@ -1,296 -1,0 +1,296 @@@
- From 1e09a90e2daeed72b3ef0be9666f1d2eb0cec628 Mon Sep 17 00:00:00 2001
++From 7928659fddbc947a5811fdf1b56734210dec2905 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_config.py | 1 +
+ tests/test_venv.py | 1 +
+ tests/test_z_cmdline.py | 31 +++++++++++++++++++++++++++++--
+ tox.ini | 2 +-
+ 4 files changed, 32 insertions(+), 3 deletions(-)
+
+diff --git a/tests/test_config.py b/tests/test_config.py
- index bc5a683..52572dd 100644
++index efbbc80..f17a198 100644
+--- a/tests/test_config.py
++++ b/tests/test_config.py
- @@ -1160,6 +1160,7 @@ class TestParseEnv:
++@@ -1242,6 +1242,7 @@ class TestParseEnv:
+ config = newconfig([], inisource)
+ assert config.envconfigs['hello'].recreate
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'), reason='Use DEP-8')
+ class TestCmdInvocation:
+ def test_help(self, cmd):
+ result = cmd.run("tox", "-h")
+diff --git a/tests/test_venv.py b/tests/test_venv.py
- index 6482e09..cde9b16 100644
++index b1d1f2e..07bcdc0 100644
+--- a/tests/test_venv.py
++++ b/tests/test_venv.py
- @@ -268,6 +268,7 @@ def test_install_error(newmocksession, monkeypatch):
++@@ -275,6 +275,7 @@ def test_install_error(newmocksession, monkeypatch):
+ mocksession.report.expect("error", "*not find*qwelkqw*")
+ assert venv.status == "commands failed"
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'), reason='Use DEP-8')
+ def test_install_command_not_installed(newmocksession, monkeypatch):
+ mocksession = newmocksession(['--recreate'], """
+ [testenv]
+diff --git a/tests/test_z_cmdline.py b/tests/test_z_cmdline.py
+index 283c993..30a7838 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
+@@ -177,6 +178,7 @@ def XXX_test_package(cmd, initproj):
+ "*created sdist package at*",
+ ])
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'), reason='Use DEP-8')
+ def test_minversion(cmd, initproj):
+ initproj("interp123-0.5", filedefs={
+ 'tests': {'test_hello.py': "def test_hello(): pass"},
+@@ -191,6 +193,7 @@ def test_minversion(cmd, initproj):
+ ])
+ assert result.ret
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'), reason='Use DEP-8')
+ def test_run_custom_install_command_error(cmd, initproj):
+ initproj("interp123-0.5", filedefs={
+ 'tox.ini': '''
+@@ -204,6 +207,7 @@ def test_run_custom_install_command_error(cmd, initproj):
+ ])
+ assert result.ret
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'), reason='Use DEP-8')
+ def test_unknown_interpreter_and_env(cmd, initproj):
+ initproj("interp123-0.5", filedefs={
+ 'tests': {'test_hello.py': "def test_hello(): pass"},
+@@ -226,6 +230,7 @@ def test_unknown_interpreter_and_env(cmd, initproj):
+ "*ERROR*unknown*",
+ ])
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'), reason='Use DEP-8')
+ def test_unknown_interpreter(cmd, initproj):
+ initproj("interp123-0.5", filedefs={
+ 'tests': {'test_hello.py': "def test_hello(): pass"},
+@@ -242,6 +247,7 @@ def test_unknown_interpreter(cmd, initproj):
+ "*ERROR*InterpreterNotFound*xyz_unknown_interpreter*",
+ ])
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'), reason='Use DEP-8')
+ def test_skip_unknown_interpreter(cmd, initproj):
+ initproj("interp123-0.5", filedefs={
+ 'tests': {'test_hello.py': "def test_hello(): pass"},
+@@ -258,6 +264,7 @@ def test_skip_unknown_interpreter(cmd, initproj):
+ "*SKIPPED*InterpreterNotFound*xyz_unknown_interpreter*",
+ ])
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'), reason='Use DEP-8')
+ def test_unknown_dep(cmd, initproj):
+ initproj("dep123-0.7", filedefs={
+ 'tests': {'test_hello.py': "def test_hello(): pass"},
+@@ -273,6 +280,7 @@ def test_unknown_dep(cmd, initproj):
+ "*ERROR*could not install*qweqwe123*",
+ ])
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'), reason='Use DEP-8')
+ def test_unknown_environment(cmd, initproj):
+ initproj("env123-0.7", filedefs={
+ 'tox.ini': ''
+@@ -283,6 +291,7 @@ def test_unknown_environment(cmd, initproj):
+ "*ERROR*unknown*environment*qpwoei*",
+ ])
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'), reason='Use DEP-8')
+ def test_skip_sdist(cmd, initproj):
+ initproj("pkg123-0.7", filedefs={
+ 'tests': {'test_hello.py': "def test_hello(): pass"},
+@@ -300,6 +309,7 @@ def test_skip_sdist(cmd, initproj):
+ result = cmd.run("tox", )
+ assert result.ret == 0
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'), reason='Use DEP-8')
+ def test_minimal_setup_py_empty(cmd, initproj):
+ initproj("pkg123-0.7", filedefs={
+ 'tests': {'test_hello.py': "def test_hello(): pass"},
+@@ -315,6 +325,7 @@ def test_minimal_setup_py_empty(cmd, initproj):
+ "*ERROR*empty*",
+ ])
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'), reason='Use DEP-8')
+ def test_minimal_setup_py_comment_only(cmd, initproj):
+ initproj("pkg123-0.7", filedefs={
+ 'tests': {'test_hello.py': "def test_hello(): pass"},
+@@ -331,6 +342,7 @@ def test_minimal_setup_py_comment_only(cmd, initproj):
+ "*ERROR*empty*",
+ ])
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'), reason='Use DEP-8')
+ def test_minimal_setup_py_non_functional(cmd, initproj):
+ initproj("pkg123-0.7", filedefs={
+ 'tests': {'test_hello.py': "def test_hello(): pass"},
+@@ -348,6 +360,7 @@ def test_minimal_setup_py_non_functional(cmd, initproj):
+ "*ERROR*check setup.py*",
+ ])
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'), reason='Use DEP-8')
+ def test_sdist_fails(cmd, initproj):
+ initproj("pkg123-0.7", filedefs={
+ 'tests': {'test_hello.py': "def test_hello(): pass"},
+@@ -363,6 +376,7 @@ def test_sdist_fails(cmd, initproj):
+ "*FAIL*could not package project*",
+ ])
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'), reason='Use DEP-8')
+ def test_package_install_fails(cmd, initproj):
+ initproj("pkg123-0.7", filedefs={
+ 'tests': {'test_hello.py': "def test_hello(): pass"},
+@@ -389,6 +403,7 @@ def test_package_install_fails(cmd, initproj):
+
+
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'), reason='Use DEP-8')
+ class TestToxRun:
+ @pytest.fixture
+ def example123(self, initproj):
+@@ -403,7 +418,7 @@ class TestToxRun:
+ changedir=tests
+ commands= py.test --basetemp={envtmpdir} \
+ --junitxml=junit-{envname}.xml
+- deps=pytest
++ sitepackages=True
+ '''
+ })
+
+@@ -450,6 +465,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': """
+ """})
+@@ -457,6 +473,7 @@ def test_develop(initproj, cmd):
+ assert not result.ret
+ assert "sdist-make" not in result.stdout.str()
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'), reason='Use DEP-8')
+ def test_usedevelop(initproj, cmd):
+ initproj("example123", filedefs={'tox.ini': """
+ [testenv]
+@@ -466,6 +483,7 @@ def test_usedevelop(initproj, cmd):
+ assert not result.ret
+ assert "sdist-make" not in result.stdout.str()
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'), reason='Use DEP-8')
+ def test_usedevelop_mixed(initproj, cmd):
+ initproj("example123", filedefs={'tox.ini': """
+ [testenv:devenv]
+@@ -484,6 +502,7 @@ def test_usedevelop_mixed(initproj, cmd):
+ assert not result.ret
+ assert "sdist-make" in result.stdout.str()
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'), reason='Use DEP-8')
+ def test_test_usedevelop(cmd, initproj):
+ initproj("example123-0.5", filedefs={
+ 'tests': {'test_hello.py': """
+@@ -497,7 +516,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")
+@@ -537,6 +556,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
+@@ -550,6 +570,7 @@ def test_test_piphelp(initproj, cmd):
+ result = cmd.run("tox")
+ assert not result.ret
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'), reason='Use DEP-8')
+ def test_notest(initproj, cmd):
+ initproj("example123", filedefs={'tox.ini': """
+ # content of: tox.ini
+@@ -568,6 +589,7 @@ def test_notest(initproj, cmd):
+ "*py26*reusing*",
+ ])
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'), reason='Use DEP-8')
+ def test_PYC(initproj, cmd, monkeypatch):
+ initproj("example123", filedefs={'tox.ini': ''})
+ monkeypatch.setenv("PYTHONDOWNWRITEBYTECODE", 1)
+@@ -577,6 +599,7 @@ def test_PYC(initproj, cmd, monkeypatch):
+ "*create*",
+ ])
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'), reason='Use DEP-8')
+ def test_env_VIRTUALENV_PYTHON(initproj, cmd, monkeypatch):
+ initproj("example123", filedefs={'tox.ini': ''})
+ monkeypatch.setenv("VIRTUALENV_PYTHON", '/FOO')
+@@ -586,6 +609,7 @@ def test_env_VIRTUALENV_PYTHON(initproj, cmd, monkeypatch):
+ "*create*",
+ ])
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'), reason='Use DEP-8')
+ def test_sdistonly(initproj, cmd):
+ initproj("example123", filedefs={'tox.ini': """
+ """})
+@@ -596,6 +620,7 @@ def test_sdistonly(initproj, cmd):
+ ])
+ assert "-mvirtualenv" not in result.stdout.str()
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'), reason='Use DEP-8')
+ def test_separate_sdist_no_sdistfile(cmd, initproj):
+ distshare = cmd.tmpdir.join("distshare")
+ initproj("pkg123-0.7", filedefs={
+@@ -611,6 +636,7 @@ def test_separate_sdist_no_sdistfile(cmd, initproj):
+ sdistfile = l[0]
+ assert 'pkg123-0.7.zip' in str(sdistfile)
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'), reason='Use DEP-8')
+ def test_separate_sdist(cmd, initproj):
+ distshare = cmd.tmpdir.join("distshare")
+ initproj("pkg123-0.7", filedefs={
+@@ -652,6 +678,7 @@ def test_installpkg(tmpdir, newconfig):
+ sdist_path = session.sdist()
+ assert sdist_path == p
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'), reason='Use DEP-8')
+ @pytest.mark.xfail("sys.platform == 'win32' and sys.version_info < (2,6)",
+ reason="test needs better impl")
+ def test_envsitepackagesdir(cmd, initproj):
+diff --git a/tox.ini b/tox.ini
+index 6bcca5e..02aa79c 100644
+--- a/tox.ini
++++ b/tox.ini
+@@ -5,7 +5,7 @@ envlist=py27,py26,py34,py33,py32,pypy,flakes
+ commands=echo {posargs}
+
+ [testenv]
+-commands=py.test --junitxml={envlogdir}/junit-{envname}.xml {posargs}
++commands=py.test-3 --junitxml={envlogdir}/junit-{envname}.xml {posargs}
+ deps=pytest>=2.3.5
+
+ [testenv:docs]
diff --cc debian/patches/de-google-ify.patch
index 4acf32a,0000000..97d3198
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 592f75b4fe1b97500eff4945261591cf032815df Mon Sep 17 00:00:00 2001
++From 6d1cb85ba424a0ac37adea2bf82a75eb8c7b4e34 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 fd15e09,0000000..394c537
mode 100644,000000..100644
--- a/debian/patches/hack-requires.patch
+++ b/debian/patches/hack-requires.patch
@@@ -1,47 -1,0 +1,47 @@@
- From db578010794aaad036b76a541e0b7b953fac7201 Mon Sep 17 00:00:00 2001
++From 0b9cb617061738fefc7d01e6e53d431a10be2a1b 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
+---
+ setup.py | 6 ------
+ tox.egg-info/requires.txt | 1 -
+ 2 files changed, 7 deletions(-)
+
+diff --git a/setup.py b/setup.py
- index 8e2f8f0..fb5c1b3 100644
++index 3a9f9bc..44e8299 100644
+--- a/setup.py
++++ b/setup.py
+@@ -18,11 +18,6 @@ class Tox(TestCommand):
+
+ def main():
+ version = sys.version_info[:2]
+- install_requires = ['virtualenv>=1.11.2', 'py>=1.4.17', ]
+- if version < (2, 7) or (3, 0) <= version <= (3, 1):
+- install_requires += ['argparse']
+- if version < (2,6):
+- install_requires += ["simplejson"]
+ setup(
+ name='tox',
+ description='virtualenv-based automation of test activities',
+@@ -39,7 +34,6 @@ def main():
+ # "deps" definition for the required dependencies
+ tests_require=['tox'],
+ cmdclass={"test": Tox},
+- install_requires=install_requires,
+ classifiers=[
+ 'Development Status :: 5 - Production/Stable',
+ 'Intended Audience :: Developers',
+diff --git a/tox.egg-info/requires.txt b/tox.egg-info/requires.txt
+index 82f5918..2219bdb 100644
+--- a/tox.egg-info/requires.txt
++++ b/tox.egg-info/requires.txt
+@@ -1,2 +1 @@
+-virtualenv>=1.11.2
+ py>=1.4.17
diff --cc debian/patches/intersphinx-mapping.patch
index 76f1fae,0000000..4eaa221
mode 100644,000000..100644
--- a/debian/patches/intersphinx-mapping.patch
+++ b/debian/patches/intersphinx-mapping.patch
@@@ -1,47 -1,0 +1,47 @@@
- From 643f0dc427e369f1f94fd0cd493a2a183265eefe Mon Sep 17 00:00:00 2001
++From 86b6c46b445778e8e461f24c32fd0aaf4cab8444 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 76dc4c3..c563e82 100644
++index 92ed895..3953ca3 100644
+--- a/doc/conf.py
++++ b/doc/conf.py
- @@ -253,7 +253,23 @@ epub_copyright = u'2010, holger krekel'
++@@ -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