[Python-modules-commits] [tox] 16/18: merge patched into master
Barry Warsaw
barry at moszumanska.debian.org
Tue Apr 28 17:44: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 d368fdb68942d9e16b4dd753e19a18c35307fb1c
Merge: fb8cffd 2fbc3ae
Author: Barry Warsaw <barry at python.org>
Date: Tue Apr 28 12:00:59 2015 -0400
merge patched into master
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 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --cc debian/.git-dpm
index ffaf4cc,0000000..81b3173
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
- 91f472ce5b7801ca81586774086e77398d21a450
- 91f472ce5b7801ca81586774086e77398d21a450
- 5266482aa1f51e4698400c9cd0f9618f7f79af49
++2fbc3ae1e8107850be777af0dca8eb6756c6d8e4
++2fbc3ae1e8107850be777af0dca8eb6756c6d8e4
++75be52a8a89f7b111187a78daa91138e28f9d0ce
+75be52a8a89f7b111187a78daa91138e28f9d0ce
+tox_1.9.2.orig.tar.gz
+611f0ecc36f415ead497816d358e8bdeb88f28f9
+93029
diff --cc debian/patches/build-time-test-adjustments.patch
index 96d4fd0,0000000..bad9c66
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 9b65089e68faba13fa5b69338d8e1468c87d86c6 Mon Sep 17 00:00:00 2001
++From 002b070237292bb00193802d9193e2fcd3c70abd 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 f957771..7c3b7f2 100644
+--- a/tests/test_config.py
++++ b/tests/test_config.py
+@@ -1346,6 +1346,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 3faa16b..fef4844 100644
+--- a/tests/test_venv.py
++++ b/tests/test_venv.py
+@@ -294,6 +294,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 0c145be..68ab3a1 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-foo", "0.7"), filedefs={
+@@ -611,6 +636,7 @@ def test_separate_sdist_no_sdistfile(cmd, initproj):
+ sdistfile = l[0]
+ assert 'pkg123-foo-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 97a1ac1..f9fea30 100644
+--- a/tox.ini
++++ b/tox.ini
+@@ -5,7 +5,7 @@ envlist=py27,py26,py34,py33,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 83fcd50,0000000..c9820df
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 91f472ce5b7801ca81586774086e77398d21a450 Mon Sep 17 00:00:00 2001
++From 2fbc3ae1e8107850be777af0dca8eb6756c6d8e4 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 edf2a93,0000000..bb63ab3
mode 100644,000000..100644
--- a/debian/patches/hack-requires.patch
+++ b/debian/patches/hack-requires.patch
@@@ -1,45 -1,0 +1,45 @@@
- From 61e94dd7916770be9b3ab358566c04a83eda05f9 Mon Sep 17 00:00:00 2001
++From f61ab73c829f315743340c6ef27d9acde9c02e00 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 | 4 ----
+ tox.egg-info/requires.txt | 1 -
+ 2 files changed, 5 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index e14f7aa..2128481 100644
+--- a/setup.py
++++ b/setup.py
+@@ -18,9 +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):
+- install_requires += ['argparse']
+ setup(
+ name='tox',
+ description='virtualenv-based automation of test activities',
+@@ -37,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 78bcaa9,0000000..c5a1093
mode 100644,000000..100644
--- a/debian/patches/intersphinx-mapping.patch
+++ b/debian/patches/intersphinx-mapping.patch
@@@ -1,47 -1,0 +1,47 @@@
- From 56c0712970d47a3fc89b0727a171d155e3a8da8e Mon Sep 17 00:00:00 2001
++From e434596f704c09bda600ce20c8cc4cb0fdd23b10 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 9c573d7..634dd9b 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