[Python-modules-commits] [tox] 55/69: merge patched into master

Barry Warsaw barry at moszumanska.debian.org
Fri Sep 5 23:26:30 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 8bad2c7a29add4511c1b8e657dd55f2feb93caa8
Merge: ddab71f 7d3c805
Author: Barry Warsaw <barry at python.org>
Date:   Fri Sep 5 18:25:34 2014 -0400

    merge patched into master

 debian/.git-dpm                                                       | 4 ++--
 debian/patches/build-time-tests.patch                                 | 2 +-
 debian/patches/de-google-ify.patch                                    | 2 +-
 debian/patches/hack-requires.patch                                    | 2 +-
 .../patches/{intersphinx_mapping.patch => intersphinx-mapping.patch}  | 4 ++--
 debian/patches/series                                                 | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --cc debian/.git-dpm
index 0e09fce,0000000..a46ada8
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
- cc0fe1d486afb46cef6d2f2be63de4c4c8c22ad8
- cc0fe1d486afb46cef6d2f2be63de4c4c8c22ad8
++7d3c805c634a311b3f04b96dabc79fbdfad7e650
++7d3c805c634a311b3f04b96dabc79fbdfad7e650
 +3a2a218f1d633f16ab8874da292a70aaa8ff6d28
 +3a2a218f1d633f16ab8874da292a70aaa8ff6d28
 +tox_1.7.2.orig.tar.gz
 +b8a0a36ad3e0169058d36c9df670f43332f2a72c
 +84875
diff --cc debian/patches/build-time-tests.patch
index 18e735e,0000000..945e15b
mode 100644,000000..100644
--- a/debian/patches/build-time-tests.patch
+++ b/debian/patches/build-time-tests.patch
@@@ -1,277 -1,0 +1,277 @@@
- From 572b40983a7c6c40e89d18480bf5a52fd78f6ead Mon Sep 17 00:00:00 2001
++From ec8b6866fa7f14e18d4d9d7430343091338099d7 Mon Sep 17 00:00:00 2001
 +From: Barry Warsaw <barry at debian.org>
 +Date: Sat, 21 Jun 2014 18:44:45 -0400
 +Subject: Various fixes to get some semblance of the test suite passing at
 +
 + package build time.  This isn't perfect because tox's tests depend on tox
 + being built and installed - a catch 22.  However, we can do a lot and there
 + are DEP-8 tests to handle the rest of it.
 +Forwarded: not-needed
 +
 +Patch-Name: build-time-tests.patch
 +---
 + tests/test_config.py    |  1 +
 + tests/test_z_cmdline.py | 31 +++++++++++++++++++++++++++++--
 + tox.ini                 |  2 +-
 + 3 files changed, 31 insertions(+), 3 deletions(-)
 +
 +diff --git a/tests/test_config.py b/tests/test_config.py
 +index bc5a683..52572dd 100644
 +--- a/tests/test_config.py
 ++++ b/tests/test_config.py
 +@@ -1160,6 +1160,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_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 14667da,0000000..87e9370
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 cc0fe1d486afb46cef6d2f2be63de4c4c8c22ad8 Mon Sep 17 00:00:00 2001
++From 7d3c805c634a311b3f04b96dabc79fbdfad7e650 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 ff3d2ca,0000000..fd15e09
mode 100644,000000..100644
--- a/debian/patches/hack-requires.patch
+++ b/debian/patches/hack-requires.patch
@@@ -1,47 -1,0 +1,47 @@@
- From 9efcca44e29e9a24a2a2a286473eb2b494ed4491 Mon Sep 17 00:00:00 2001
++From db578010794aaad036b76a541e0b7b953fac7201 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
 +--- 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 256be93,0000000..76f1fae
mode 100644,000000..100644
--- a/debian/patches/intersphinx-mapping.patch
+++ b/debian/patches/intersphinx-mapping.patch
@@@ -1,47 -1,0 +1,47 @@@
- From cc2fc5f5af8508983d562a4c07508f85be960803 Mon Sep 17 00:00:00 2001
++From 643f0dc427e369f1f94fd0cd493a2a183265eefe 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
++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
 +--- a/doc/conf.py
 ++++ b/doc/conf.py
 +@@ -253,7 +253,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 79440b4,0000000..fa8b593
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,0 +1,4 @@@
- intersphinx_mapping.patch
++intersphinx-mapping.patch
 +hack-requires.patch
 +build-time-tests.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