[Python-apps-commits] r10243 - in packages/tox/trunk/debian (10 files)
barry at users.alioth.debian.org
barry at users.alioth.debian.org
Mon Dec 9 20:12:09 UTC 2013
Date: Monday, December 9, 2013 @ 20:12:08
Author: barry
Revision: 10243
* 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-netwir.
- 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.
Added:
packages/tox/trunk/debian/patches/no-network.patch
Modified:
packages/tox/trunk/debian/changelog
packages/tox/trunk/debian/control
packages/tox/trunk/debian/patches/series
packages/tox/trunk/debian/rules
packages/tox/trunk/debian/tests/built
packages/tox/trunk/debian/tests/control
Deleted:
packages/tox/trunk/debian/patches/no-download.patch
packages/tox/trunk/debian/patches/test-fixes.patch
packages/tox/trunk/debian/patches/testenv-deps.patch
Modified: packages/tox/trunk/debian/changelog
===================================================================
--- packages/tox/trunk/debian/changelog 2013-12-09 18:23:55 UTC (rev 10242)
+++ packages/tox/trunk/debian/changelog 2013-12-09 20:12:08 UTC (rev 10243)
@@ -1,3 +1,23 @@
+tox (1.7.0-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-netwir.
+ - 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.
+
+ -- Barry Warsaw <barry at debian.org> Wed, 04 Sep 2013 16:26:52 -0400
+
tox (1.6.0-1) unstable; urgency=low
* New upstream release.
Modified: packages/tox/trunk/debian/control
===================================================================
--- packages/tox/trunk/debian/control 2013-12-09 18:23:55 UTC (rev 10242)
+++ packages/tox/trunk/debian/control 2013-12-09 20:12:08 UTC (rev 10243)
@@ -8,6 +8,7 @@
python-all,
python-argparse,
python-doc,
+ python-pip,
python-pkg-resources,
python-py,
python-pytest,
@@ -18,7 +19,7 @@
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
-#XS-Testsuite: autopkgtest
+XS-Testsuite: autopkgtest
Package: python-tox
Architecture: all
Deleted: packages/tox/trunk/debian/patches/no-download.patch
===================================================================
--- packages/tox/trunk/debian/patches/no-download.patch 2013-12-09 18:23:55 UTC (rev 10242)
+++ packages/tox/trunk/debian/patches/no-download.patch 2013-12-09 20:12:08 UTC (rev 10243)
@@ -1,13 +0,0 @@
-Description: Prevent internet access when running tox's own tests.
-Author: Barry Warsaw <barry at debian.org>
-Forwarded: not-needed
-
---- a/tox.ini
-+++ b/tox.ini
-@@ -1,5 +1,6 @@
- [tox]
- envlist=py25,py27,py26,py32,py33,pypy
-+sitepackages=True
-
- [testenv:X]
- commands=echo {posargs}
Added: packages/tox/trunk/debian/patches/no-network.patch
===================================================================
--- packages/tox/trunk/debian/patches/no-network.patch (rev 0)
+++ packages/tox/trunk/debian/patches/no-network.patch 2013-12-09 20:12:08 UTC (rev 10243)
@@ -0,0 +1,11 @@
+--- 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 2013-12-09 18:23:55 UTC (rev 10242)
+++ packages/tox/trunk/debian/patches/series 2013-12-09 20:12:08 UTC (rev 10243)
@@ -1,4 +1,2 @@
intersphinx_mapping.patch
-no-download.patch
-testenv-deps.patch
-test-fixes.patch
+no-network.patch
Deleted: packages/tox/trunk/debian/patches/test-fixes.patch
===================================================================
--- packages/tox/trunk/debian/patches/test-fixes.patch 2013-12-09 18:23:55 UTC (rev 10242)
+++ packages/tox/trunk/debian/patches/test-fixes.patch 2013-12-09 20:12:08 UTC (rev 10243)
@@ -1,26 +0,0 @@
-Description: Fix tests by using .realpath() on both sides of the assertion.
-Author: Barry Warsaw <barry at debian.org>
-Bug: https://bitbucket.org/hpk42/tox/issue/118/test-failures-in-a-debian-build
-
---- a/tests/test_venv.py
-+++ b/tests/test_venv.py
-@@ -25,7 +25,8 @@
- venv = VirtualEnv(config.envconfigs['python'], session=mocksession)
- interp = venv.getsupportedinterpreter()
- # realpath needed for debian symlinks
-- assert interp == py.path.local(sys.executable).realpath()
-+ assert py.path.local(interp).realpath() \
-+ == py.path.local(sys.executable).realpath()
- monkeypatch.setattr(sys, 'platform', "win32")
- monkeypatch.setattr(venv.envconfig, 'basepython', 'jython')
- py.test.raises(tox.exception.UnsupportedInterpreter,
-@@ -51,7 +52,8 @@
- assert "virtualenv" in str(args[1])
- if sys.platform != "win32":
- # realpath is needed for stuff like the debian symlinks
-- assert py.path.local(sys.executable).realpath() == args[0]
-+ assert py.path.local(sys.executable).realpath() \
-+ == py.path.local(args[0]).realpath()
- #assert Envconfig.toxworkdir in args
- assert venv.getcommandpath("easy_install", cwd=py.path.local())
- interp = venv._getliveconfig().python
Deleted: packages/tox/trunk/debian/patches/testenv-deps.patch
===================================================================
--- packages/tox/trunk/debian/patches/testenv-deps.patch 2013-12-09 18:23:55 UTC (rev 10242)
+++ packages/tox/trunk/debian/patches/testenv-deps.patch 2013-12-09 20:12:08 UTC (rev 10243)
@@ -1,21 +0,0 @@
-Description: Prevent failures due to inability to download pytest.
- Just get this from the archive during builds.
-Author: Barry Warsaw <barry at debian.org>
-Forwarded: not-needed
-
---- a/tox.ini
-+++ b/tox.ini
-@@ -7,13 +7,11 @@
-
- [testenv]
- commands=py.test --junitxml={envlogdir}/junit-{envname}.xml {posargs}
--deps=pytest>=2.3.5
-
- [testenv:docs]
- basepython=python
- changedir=doc
- deps=sphinx
-- {[testenv]deps}
- commands=
- py.test -v \
- --junitxml={envlogdir}/junit-{envname}.xml \
Modified: packages/tox/trunk/debian/rules
===================================================================
--- packages/tox/trunk/debian/rules 2013-12-09 18:23:55 UTC (rev 10242)
+++ packages/tox/trunk/debian/rules 2013-12-09 20:12:08 UTC (rev 10243)
@@ -3,17 +3,21 @@
PYTHON2=$(shell pyversions -dv)
#PYTHON3=$(shell py3versions -sv)
-# $HOME must exist for tox to be happy, but an sbuild environment sets it to a
-# non-existent directory. Use this tempdir as the fake $HOME for testing
-# purposes.
-FAKEHOME=$(shell mktemp -dq)
-
# 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
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+test-python%:
+ PYTHONPATH=.:/usr/lib/python$*/dist-packages \
+ py.test --no-network
+
+override_dh_auto_test: $(PYTHON2:%=test-python%) $(PYTHON3:%=test-python%)
+endif
+
override_dh_installdocs:
python setup.py build_sphinx
dh_installdocs build/sphinx/html
@@ -31,19 +35,3 @@
rm -rf build
rm -rf *.egg-info
rm -rf debian/manpage/_build
-
-# $HOME must exist for tox to be happy.
-#
-# https://bitbucket.org/hpk42/tox/issue/105/hidden-dependency-on-home#comment-5176027
-#
-# Also, because the tox(1) script doesn't exist until the package is
-# installed (although I suppose we could run it out of the built
-# location), invoke the main() function explicitly.
-
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-test-python%:
- PYTHONPATH=.:/usr/lib/python$*/dist-packages \
- HOME=/tmp python$* -c 'from tox._cmdline import main; main(["-e", "py"+"$*".replace(".", "")])'
-
-override_dh_auto_test: $(PYTHON2:%=test-python%) $(PYTHON3:%=test-python%)
-endif
Modified: packages/tox/trunk/debian/tests/built
===================================================================
--- packages/tox/trunk/debian/tests/built 2013-12-09 18:23:55 UTC (rev 10242)
+++ packages/tox/trunk/debian/tests/built 2013-12-09 20:12:08 UTC (rev 10243)
@@ -1,20 +1,4 @@
-#!/usr/bin/python3
-
-# autopkgtest check: Run the upstream tox tests using tox itself. We control
-# the test environment though, since the list of upstream supported Python
-# versions may not match the list of installed Python versions.
-
-from subprocess import check_output
-
-py2versions = check_output(['pyversions', '-iv']).splitlines()
-py3versions = check_output(['py3versions', '-iv']).splitlines()
-
-pyenvs = [
- 'py' + version.decode('us-ascii').replace('.', '')
- for version in py2versions + py3versions
- ]
-
-command = ['tox', '-e']
-command.extend(pyenvs)
-
-check_output(command)
+#!/bin/sh
+export http_proxy=http://127.0.9.1:9
+export https_proxy=https://127.0.9.1:9
+tox -e py27 --sitepackages
Modified: packages/tox/trunk/debian/tests/control
===================================================================
--- packages/tox/trunk/debian/tests/control 2013-12-09 18:23:55 UTC (rev 10242)
+++ packages/tox/trunk/debian/tests/control 2013-12-09 20:12:08 UTC (rev 10243)
@@ -1,2 +1,2 @@
Tests: built
-Depends: python-all, python3-all, @
+Depends: @, python-all, python-pytest, python-virtualenv, python-pip
More information about the Python-apps-commits
mailing list