[Python-modules-commits] [tox] 07/09: merge patched into master
Barry Warsaw
barry at moszumanska.debian.org
Mon Jul 13 22:46:07 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 55823c01f1cc276be83278f98f5ebffb93cacf6c
Merge: 162dc67 5921da6
Author: Barry Warsaw <barry at ubuntu.com>
Date: Mon Jul 13 18:26:59 2015 -0400
merge patched into master
CHANGELOG | 104 ++
PKG-INFO | 6 +-
README.rst | 4 +-
debian/.git-dpm | 6 +-
debian/patches/build-time-test-adjustments.patch | 248 +----
debian/patches/de-google-ify.patch | 2 +-
debian/patches/hack-requires.patch | 33 +-
debian/patches/intersphinx-mapping.patch | 4 +-
doc/Makefile | 1 +
doc/announce/release-2.0.txt | 111 +++
doc/conf.py | 6 +-
doc/config-v2.txt | 4 +-
doc/config.txt | 66 +-
doc/example/basic.txt | 34 +-
doc/example/general.txt | 9 +-
doc/example/jenkins.txt | 2 +-
doc/index.txt | 20 +-
doc/install.txt | 2 +-
doc/links.txt | 1 -
doc/plugins.txt | 82 ++
doc/support.txt | 3 +-
setup.cfg | 3 +
setup.py | 35 +-
tests/test_config.py | 627 ++++++++----
tests/test_interpreters.py | 62 +-
tests/test_result.py | 13 +-
tests/test_venv.py | 172 ++--
tests/test_z_cmdline.py | 140 +--
tox.egg-info/PKG-INFO | 6 +-
tox.egg-info/SOURCES.txt | 14 +-
tox.egg-info/requires.txt | 4 +
tox.ini | 44 +-
tox/__init__.py | 10 +-
tox/__main__.py | 5 +-
tox/_config.py | 818 ----------------
tox/_exception.py | 16 -
tox/_pytestplugin.py | 74 +-
tox/_quickstart.py | 17 +-
tox/_verlib.py | 16 +-
tox/config.py | 1126 ++++++++++++++++++++++
tox/hookspecs.py | 32 +
tox/interpreters.py | 98 +-
tox/result.py | 27 +-
tox/{_cmdline.py => session.py} | 232 +++--
tox/vendor/__init__.py | 1 -
tox/{_venv.py => venv.py} | 203 ++--
46 files changed, 2679 insertions(+), 1864 deletions(-)
diff --cc debian/.git-dpm
index 9ce03d4,0000000..aee8a6d
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
- 2fbc3ae1e8107850be777af0dca8eb6756c6d8e4
- 2fbc3ae1e8107850be777af0dca8eb6756c6d8e4
- 75be52a8a89f7b111187a78daa91138e28f9d0ce
++5921da6ee538a49671bc6c6c7fe24aa2aa43fa8f
++5921da6ee538a49671bc6c6c7fe24aa2aa43fa8f
++6e320b49d2b82f58d78631a1881c4f13f0a3e72e
+6e320b49d2b82f58d78631a1881c4f13f0a3e72e
+tox_2.1.1.orig.tar.gz
+32be3ba78431f83e3542e0a4dfbea6ad349af2db
+102170
diff --cc debian/patches/build-time-test-adjustments.patch
index bad9c66,0000000..06af098
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,78 @@@
- From 002b070237292bb00193802d9193e2fcd3c70abd Mon Sep 17 00:00:00 2001
++From 390037a84b5f3bc3a5708f57ac5c8a9dbcf815a4 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(-)
++ tests/test_z_cmdline.py | 7 +++++--
++ tox.ini | 2 +-
++ 2 files changed, 6 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
++index b288880..cc6deb7 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:
++@@ -431,7 +432,7 @@ class TestToxRun:
+ changedir=tests
+ commands= py.test --basetemp={envtmpdir} \
+ --junitxml=junit-{envname}.xml
+- deps=pytest
++ sitepackages=True
+ '''
+ })
+
- @@ -450,6 +465,7 @@ class TestToxRun:
++@@ -478,6 +479,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):
++@@ -529,7 +531,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):
++@@ -569,6 +571,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
++index d78bcbd..eb4980b 100644
+--- a/tox.ini
++++ b/tox.ini
- @@ -5,7 +5,7 @@ envlist=py27,py26,py34,py33,pypy,flakes
++@@ -5,7 +5,7 @@ envlist=py27,py26,py34,py33,pypy,flakes,py26-bare
+ 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
++-commands= py.test --timeout=180 {posargs}
+++commands= py.test-3 --timeout=180 {posargs}
+
- [testenv:docs]
++ deps=pytest>=2.3.5
++ pytest-timeout
diff --cc debian/patches/de-google-ify.patch
index c9820df,0000000..5a1aeb6
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 2fbc3ae1e8107850be777af0dca8eb6756c6d8e4 Mon Sep 17 00:00:00 2001
++From 5921da6ee538a49671bc6c6c7fe24aa2aa43fa8f 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 bb63ab3,0000000..451533c
mode 100644,000000..100644
--- a/debian/patches/hack-requires.patch
+++ b/debian/patches/hack-requires.patch
@@@ -1,45 -1,0 +1,24 @@@
- From f61ab73c829f315743340c6ef27d9acde9c02e00 Mon Sep 17 00:00:00 2001
++From 230b1e43f0e0da69e72f76f57dd2d271614baed3 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(-)
++ 1 file changed, 1 deletion(-)
+
- 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
++index a1ef299..a63bc74 100644
+--- a/tox.egg-info/requires.txt
++++ b/tox.egg-info/requires.txt
- @@ -1,2 +1 @@
++@@ -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 c5a1093,0000000..1c9c705
mode 100644,000000..100644
--- a/debian/patches/intersphinx-mapping.patch
+++ b/debian/patches/intersphinx-mapping.patch
@@@ -1,47 -1,0 +1,47 @@@
- From e434596f704c09bda600ce20c8cc4cb0fdd23b10 Mon Sep 17 00:00:00 2001
++From 45ddbb723b83af5ba180745b054ee067ec2be14a 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
++index 630cb80..589c108 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