[Python-apps-commits] r10966 - in packages/tox/trunk/debian (12 files)
barry at users.alioth.debian.org
barry at users.alioth.debian.org
Tue Jun 17 19:14:45 UTC 2014
Date: Tuesday, June 17, 2014 @ 19:14:44
Author: barry
Revision: 10966
* d/control:
- Re-enable DEP 8 tests.
- Add missing Build-Depend dependencies.
- Switch to using Python 3 only.
- Add to Depends: python3-py, python3-virtualenv
- Add X-Python3-Version header and remove X-Python-Version header.
- Bump Standards-Version to 3.9.5 with no other changes necessary.
* d/rules: Switch to Python 3. Closes: #746236
* d/tests
- built: Simplify and switch to /bin/sh.
- control: Update to use Python 3 dependencies.
* d/patches:
- hack-requires.patch: Added; use Depends instead.
- build-time-tests.patch: Added; skips build-time tests which
require an installed `tox` executable. These are tested by the DEP-8
tests.
- de-google-ify.patch: Added; fixes privacy-breach-google-adsense
lintian errors.
- test-fixes.patch: Removed; applied upstream.
- no-download.patch: Removed; obsolete.
- testenv-deps.patch: Removed; obsolete.
* d/python-tox.pyremove: Removed.
* d/python-tox.docs: Update.
Added:
packages/tox/trunk/debian/patches/build-time-tests.patch
packages/tox/trunk/debian/patches/de-google-ify.patch
packages/tox/trunk/debian/patches/hack-requires.patch
Modified:
packages/tox/trunk/debian/changelog
packages/tox/trunk/debian/control
packages/tox/trunk/debian/patches/series
packages/tox/trunk/debian/python-tox.docs
packages/tox/trunk/debian/rules
packages/tox/trunk/debian/tests/built
packages/tox/trunk/debian/tests/control
Deleted:
packages/tox/trunk/debian/patches/no-network.patch
packages/tox/trunk/debian/python-tox.pyremove
Modified: packages/tox/trunk/debian/changelog
===================================================================
--- packages/tox/trunk/debian/changelog 2014-06-17 07:40:20 UTC (rev 10965)
+++ packages/tox/trunk/debian/changelog 2014-06-17 19:14:44 UTC (rev 10966)
@@ -1,22 +1,31 @@
-tox (1.7.0-1) UNRELEASED; urgency=low
+tox (1.7.1-1) UNRELEASED; urgency=low
* New upstream release.
- - d/control:
- + Re-enable DEP 8 tests.
- + Add missing Build-Depend.
- - d/rules:
- + Add null proxy for https_proxy since PyPI is now accessed via https.
- + Remove FAKEHOME; no longer necessary.
- + Re-enable build-time tests now that py.test has --no-network.
- - d/tests/built: Simplify and switch to /bin/sh.
- - d/tests/control: We only need Python 2 dependencies.
- - d/patches/no-network.patch: Use py.test --no-network in tox.ini
- to prevent tox's own test suite from accessing PyPI.
- - d/patches/test-fixes.patch: Removed; applied upstream.
- - d/patches/no-download.patch: Removed; obsolete.
- - d/patches/testenv-deps.patch: Removed; obsolete.
+ * d/control:
+ - Re-enable DEP 8 tests.
+ - Add missing Build-Depend dependencies.
+ - Switch to using Python 3 only.
+ - Add to Depends: python3-py, python3-virtualenv
+ - Add X-Python3-Version header and remove X-Python-Version header.
+ - Bump Standards-Version to 3.9.5 with no other changes necessary.
+ * d/rules: Switch to Python 3. Closes: #746236
+ * d/tests
+ - built: Simplify and switch to /bin/sh.
+ - control: Update to use Python 3 dependencies.
+ * d/patches:
+ - hack-requires.patch: Added; use Depends instead.
+ - build-time-tests.patch: Added; skips build-time tests which
+ require an installed `tox` executable. These are tested by the DEP-8
+ tests.
+ - de-google-ify.patch: Added; fixes privacy-breach-google-adsense
+ lintian errors.
+ - test-fixes.patch: Removed; applied upstream.
+ - no-download.patch: Removed; obsolete.
+ - testenv-deps.patch: Removed; obsolete.
+ * d/python-tox.pyremove: Removed.
+ * d/python-tox.docs: Update.
- -- Barry Warsaw <barry at debian.org> Wed, 04 Sep 2013 16:26:52 -0400
+ -- Barry Warsaw <barry at debian.org> Thu, 29 May 2014 16:53:29 -0400
tox (1.6.0-1) unstable; urgency=low
@@ -35,7 +44,7 @@
[ Jakub Wilk ]
* Use canonical URIs for Vcs-* fields.
-
+
[ Barry Warsaw ]
* New upstream release. (Closes: #702009)
* d/control: Update maintainer email.
Modified: packages/tox/trunk/debian/control
===================================================================
--- packages/tox/trunk/debian/control 2014-06-17 07:40:20 UTC (rev 10965)
+++ packages/tox/trunk/debian/control 2014-06-17 19:14:44 UTC (rev 10966)
@@ -5,27 +5,28 @@
Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
Homepage: http://codespeak.net/tox
Build-Depends: debhelper (>= 8),
- python-all,
- python-argparse,
- python-doc,
- python-pip,
- python-pkg-resources,
- python-py,
- python-pytest,
- python-setuptools,
- python-sphinx (>= 1.0.7+dfsg),
- python-virtualenv
-Standards-Version: 3.9.4
+ python3-all,
+ python3-pip,
+ python3-pkg-resources,
+ python3-py,
+ python3-pytest,
+ python3-setuptools,
+ python3-sphinx,
+ python3-virtualenv
+Standards-Version: 3.9.5
Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/tox/trunk/
Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/tox/trunk/
-X-Python-Version: >= 2.6
+X-Python3-Version: >= 3.2
XS-Testsuite: autopkgtest
Package: python-tox
Architecture: all
-Depends: python-pkg-resources,
+Depends: python3,
+ python3-pkg-resources,
+ python3-py,
+ python3-virtualenv,
${misc:Depends},
- ${python:Depends},
+ ${python3:Depends},
${sphinxdoc:Depends}
Description: virtualenv-based automation of test activities
Tox as is a generic virtualenv management and test command line tool
Added: packages/tox/trunk/debian/patches/build-time-tests.patch
===================================================================
--- packages/tox/trunk/debian/patches/build-time-tests.patch (rev 0)
+++ packages/tox/trunk/debian/patches/build-time-tests.patch 2014-06-17 19:14:44 UTC (rev 10966)
@@ -0,0 +1,227 @@
+Description: 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.
+Author: Barry Warsaw <barry at debian.org>
+Forwarded: not-needed
+
+--- a/tox.ini
++++ b/tox.ini
+@@ -5,7 +5,7 @@
+ 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]
+--- a/tests/test_config.py
++++ b/tests/test_config.py
+@@ -1101,6 +1101,7 @@
+ config = newconfig([], inisource)
+ assert config.envconfigs['hello'].recreate
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
+ class TestCmdInvocation:
+ def test_help(self, cmd):
+ result = cmd.run("tox", "-h")
+--- a/tests/test_z_cmdline.py
++++ b/tests/test_z_cmdline.py
+@@ -1,3 +1,4 @@
++import os
+ import tox
+ import py
+ import pytest
+@@ -179,6 +180,7 @@
+ "*created sdist package at*",
+ ])
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
+ def test_minversion(cmd, initproj):
+ initproj("interp123-0.5", filedefs={
+ 'tests': {'test_hello.py': "def test_hello(): pass"},
+@@ -193,6 +195,7 @@
+ ])
+ assert result.ret
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
+ def test_unknown_interpreter_and_env(cmd, initproj):
+ initproj("interp123-0.5", filedefs={
+ 'tests': {'test_hello.py': "def test_hello(): pass"},
+@@ -215,6 +218,7 @@
+ "*ERROR*unknown*",
+ ])
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
+ def test_unknown_interpreter(cmd, initproj):
+ initproj("interp123-0.5", filedefs={
+ 'tests': {'test_hello.py': "def test_hello(): pass"},
+@@ -231,6 +235,7 @@
+ "*ERROR*InterpreterNotFound*xyz_unknown_interpreter*",
+ ])
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
+ def test_unknown_dep(cmd, initproj):
+ initproj("dep123-0.7", filedefs={
+ 'tests': {'test_hello.py': "def test_hello(): pass"},
+@@ -246,6 +251,7 @@
+ "*ERROR*could not install*qweqwe123*",
+ ])
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
+ def test_unknown_environment(cmd, initproj):
+ initproj("env123-0.7", filedefs={
+ 'tox.ini': ''
+@@ -256,6 +262,7 @@
+ "*ERROR*unknown*environment*qpwoei*",
+ ])
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
+ def test_skip_sdist(cmd, initproj):
+ initproj("pkg123-0.7", filedefs={
+ 'tests': {'test_hello.py': "def test_hello(): pass"},
+@@ -273,6 +280,7 @@
+ result = cmd.run("tox", )
+ assert result.ret == 0
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
+ def test_minimal_setup_py_empty(cmd, initproj):
+ initproj("pkg123-0.7", filedefs={
+ 'tests': {'test_hello.py': "def test_hello(): pass"},
+@@ -288,6 +296,7 @@
+ "*ERROR*empty*",
+ ])
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
+ def test_minimal_setup_py_comment_only(cmd, initproj):
+ initproj("pkg123-0.7", filedefs={
+ 'tests': {'test_hello.py': "def test_hello(): pass"},
+@@ -304,6 +313,7 @@
+ "*ERROR*empty*",
+ ])
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
+ def test_minimal_setup_py_non_functional(cmd, initproj):
+ initproj("pkg123-0.7", filedefs={
+ 'tests': {'test_hello.py': "def test_hello(): pass"},
+@@ -321,6 +331,7 @@
+ "*ERROR*check setup.py*",
+ ])
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
+ def test_sdist_fails(cmd, initproj):
+ initproj("pkg123-0.7", filedefs={
+ 'tests': {'test_hello.py': "def test_hello(): pass"},
+@@ -336,6 +347,7 @@
+ "*FAIL*could not package project*",
+ ])
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
+ def test_package_install_fails(cmd, initproj):
+ initproj("pkg123-0.7", filedefs={
+ 'tests': {'test_hello.py': "def test_hello(): pass"},
+@@ -362,6 +374,7 @@
+
+
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
+ class TestToxRun:
+ @pytest.fixture
+ def example123(self, initproj):
+@@ -423,6 +436,7 @@
+ ])
+
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
+ def test_develop(initproj, cmd):
+ initproj("example123", filedefs={'tox.ini': """
+ """})
+@@ -430,6 +444,7 @@
+ assert not result.ret
+ assert "sdist-make" not in result.stdout.str()
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
+ def test_usedevelop(initproj, cmd):
+ initproj("example123", filedefs={'tox.ini': """
+ [testenv]
+@@ -439,6 +454,7 @@
+ assert not result.ret
+ assert "sdist-make" not in result.stdout.str()
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
+ def test_usedevelop_mixed(initproj, cmd):
+ initproj("example123", filedefs={'tox.ini': """
+ [testenv:devenv]
+@@ -457,6 +473,7 @@
+ assert not result.ret
+ assert "sdist-make" in result.stdout.str()
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
+ def test_test_usedevelop(cmd, initproj):
+ initproj("example123-0.5", filedefs={
+ 'tests': {'test_hello.py': """
+@@ -510,6 +527,7 @@
+ ])
+
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
+ def test_test_piphelp(initproj, cmd):
+ initproj("example123", filedefs={'tox.ini': """
+ # content of: tox.ini
+@@ -523,6 +541,7 @@
+ result = cmd.run("tox")
+ assert not result.ret
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
+ def test_notest(initproj, cmd):
+ initproj("example123", filedefs={'tox.ini': """
+ # content of: tox.ini
+@@ -541,6 +560,7 @@
+ "*py26*reusing*",
+ ])
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
+ def test_PYC(initproj, cmd, monkeypatch):
+ initproj("example123", filedefs={'tox.ini': ''})
+ monkeypatch.setenv("PYTHONDOWNWRITEBYTECODE", 1)
+@@ -550,6 +570,7 @@
+ "*create*",
+ ])
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
+ def test_env_VIRTUALENV_PYTHON(initproj, cmd, monkeypatch):
+ initproj("example123", filedefs={'tox.ini': ''})
+ monkeypatch.setenv("VIRTUALENV_PYTHON", '/FOO')
+@@ -559,6 +580,7 @@
+ "*create*",
+ ])
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
+ def test_sdistonly(initproj, cmd):
+ initproj("example123", filedefs={'tox.ini': """
+ """})
+@@ -569,6 +591,7 @@
+ ])
+ assert "virtualenv" not in result.stdout.str()
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
+ def test_separate_sdist_no_sdistfile(cmd, initproj):
+ distshare = cmd.tmpdir.join("distshare")
+ initproj("pkg123-0.7", filedefs={
+@@ -583,6 +606,7 @@
+ assert len(l) == 1
+ sdistfile = l[0]
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
+ def test_separate_sdist(cmd, initproj):
+ distshare = cmd.tmpdir.join("distshare")
+ initproj("pkg123-0.7", filedefs={
+@@ -625,6 +649,7 @@
+ sdist_path = session.sdist()
+ assert sdist_path == p
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
+ @pytest.mark.xfail("sys.platform == 'win32' and sys.version_info < (2,6)",
+ reason="test needs better impl")
+ def test_envsitepackagesdir(cmd, initproj):
Added: packages/tox/trunk/debian/patches/de-google-ify.patch
===================================================================
--- packages/tox/trunk/debian/patches/de-google-ify.patch (rev 0)
+++ packages/tox/trunk/debian/patches/de-google-ify.patch 2014-06-17 19:14:44 UTC (rev 10966)
@@ -0,0 +1,16 @@
+--- 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 %}
Added: packages/tox/trunk/debian/patches/hack-requires.patch
===================================================================
--- packages/tox/trunk/debian/patches/hack-requires.patch (rev 0)
+++ packages/tox/trunk/debian/patches/hack-requires.patch 2014-06-17 19:14:44 UTC (rev 10966)
@@ -0,0 +1,35 @@
+Description: 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.
+Author: Barry Warsaw <barry at debian.org>
+Forwarded: not-needed
+
+--- a/tox.egg-info/requires.txt
++++ b/tox.egg-info/requires.txt
+@@ -1,2 +1 @@
+-virtualenv>=1.11.2
+ py>=1.4.17
+\ No newline at end of file
+--- a/setup.py
++++ b/setup.py
+@@ -18,11 +18,6 @@
+
+ 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 @@
+ # "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',
Deleted: packages/tox/trunk/debian/patches/no-network.patch
===================================================================
--- packages/tox/trunk/debian/patches/no-network.patch 2014-06-17 07:40:20 UTC (rev 10965)
+++ packages/tox/trunk/debian/patches/no-network.patch 2014-06-17 19:14:44 UTC (rev 10966)
@@ -1,11 +0,0 @@
---- a/tox.ini
-+++ b/tox.ini
-@@ -5,7 +5,7 @@
- commands=echo {posargs}
-
- [testenv]
--commands=py.test --junitxml={envlogdir}/junit-{envname}.xml {posargs}
-+commands=py.test --no-network --junitxml={envlogdir}/junit-{envname}.xml {posargs}
- deps=pytest>=2.3.5
-
- [testenv:docs]
Modified: packages/tox/trunk/debian/patches/series
===================================================================
--- packages/tox/trunk/debian/patches/series 2014-06-17 07:40:20 UTC (rev 10965)
+++ packages/tox/trunk/debian/patches/series 2014-06-17 19:14:44 UTC (rev 10966)
@@ -1,2 +1,4 @@
intersphinx_mapping.patch
-no-network.patch
+hack-requires.patch
+build-time-tests.patch
+de-google-ify.patch
Modified: packages/tox/trunk/debian/python-tox.docs
===================================================================
--- packages/tox/trunk/debian/python-tox.docs 2014-06-17 07:40:20 UTC (rev 10965)
+++ packages/tox/trunk/debian/python-tox.docs 2014-06-17 19:14:44 UTC (rev 10966)
@@ -1,2 +1,3 @@
ISSUES.txt
README.rst
+doc/*.txt
Deleted: packages/tox/trunk/debian/python-tox.pyremove
===================================================================
--- packages/tox/trunk/debian/python-tox.pyremove 2014-06-17 07:40:20 UTC (rev 10965)
+++ packages/tox/trunk/debian/python-tox.pyremove 2014-06-17 19:14:44 UTC (rev 10966)
@@ -1 +0,0 @@
-tox-*.egg-info/SOURCES.txt
Modified: packages/tox/trunk/debian/rules
===================================================================
--- packages/tox/trunk/debian/rules 2014-06-17 07:40:20 UTC (rev 10965)
+++ packages/tox/trunk/debian/rules 2014-06-17 19:14:44 UTC (rev 10966)
@@ -1,25 +1,36 @@
#!/usr/bin/make -f
-PYTHON2=$(shell pyversions -dv)
-#PYTHON3=$(shell py3versions -sv)
+#export DH_VERBOSE=1
+PYTHON3=$(shell py3versions -sv)
# Prevent setuptools/distribute from accessing the internet.
export http_proxy = http://127.0.9.1:9
export https_proxy = https://127.0.9.1:9
+
%:
- dh $@ --buildsystem=python_distutils --with=python2,sphinxdoc
+ dh $@ --with=python3,sphinxdoc --buildsystem=pybuild
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
test-python%:
- PYTHONPATH=.:/usr/lib/python$*/dist-packages \
- py.test --no-network
+ nodot=$(shell echo $* | cut --complement -b 2); \
+ PYTHONPATH=`pwd`:$$PYTHONPATH DEB_SKIP_TOX_TESTS=1 \
+ python$* -mtox --sitepackages -e py$${nodot}
-override_dh_auto_test: $(PYTHON2:%=test-python%) $(PYTHON3:%=test-python%)
+override_dh_auto_test: $(PYTHON3:%=test-python%)
endif
+# pybuild can't yet handle Python 3 packages that don't start with "python3-".
+# See bug #751908 - In the meantime, this override isn't perfect, but it gets
+# close enough.
+override_dh_auto_install:
+ dh_auto_install
+ mv debian/python-tox/usr/lib/python3.? \
+ debian/python-tox/usr/lib/python3
+ find debian/python-tox -name __pycache__ | xargs rm -rf
+
override_dh_installdocs:
- python setup.py build_sphinx
+ python3 setup.py build_sphinx
dh_installdocs build/sphinx/html
override_dh_installman:
@@ -34,4 +45,5 @@
dh_auto_clean
rm -rf build
rm -rf *.egg-info
+ rm -rf .tox
rm -rf debian/manpage/_build
Modified: packages/tox/trunk/debian/tests/built
===================================================================
--- packages/tox/trunk/debian/tests/built 2014-06-17 07:40:20 UTC (rev 10965)
+++ packages/tox/trunk/debian/tests/built 2014-06-17 19:14:44 UTC (rev 10966)
@@ -1,4 +1,5 @@
#!/bin/sh
export http_proxy=http://127.0.9.1:9
export https_proxy=https://127.0.9.1:9
-tox -e py27 --sitepackages
+export toxenv=`python3 -c "import sys; print('py{}{}'.format(*sys.version_info[:2]))"`
+tox -e $toxenv --sitepackages
Modified: packages/tox/trunk/debian/tests/control
===================================================================
--- packages/tox/trunk/debian/tests/control 2014-06-17 07:40:20 UTC (rev 10965)
+++ packages/tox/trunk/debian/tests/control 2014-06-17 19:14:44 UTC (rev 10966)
@@ -1,2 +1,2 @@
Tests: built
-Depends: @, python-all, python-pytest, python-virtualenv, python-pip
+Depends: @, python3-all, python3-pytest, python-virtualenv, python3-pip
More information about the Python-apps-commits
mailing list