[Python-apps-commits] r10988 - in packages/tox/trunk/debian (3 files)
barry at users.alioth.debian.org
barry at users.alioth.debian.org
Sat Jun 21 22:44:22 UTC 2014
Date: Saturday, June 21, 2014 @ 22:44:21
Author: barry
Revision: 10988
* d/patches/build-time-tests.patch: Fix DEP-8 related failures.
* d/tests/control: Update dependencies.
Modified:
packages/tox/trunk/debian/changelog
packages/tox/trunk/debian/patches/build-time-tests.patch
packages/tox/trunk/debian/tests/control
Modified: packages/tox/trunk/debian/changelog
===================================================================
--- packages/tox/trunk/debian/changelog 2014-06-21 19:38:57 UTC (rev 10987)
+++ packages/tox/trunk/debian/changelog 2014-06-21 22:44:21 UTC (rev 10988)
@@ -1,3 +1,10 @@
+tox (1.7.1-3) UNRELEASED; urgency=medium
+
+ * d/patches/build-time-tests.patch: Fix DEP-8 related failures.
+ * d/tests/control: Update dependencies.
+
+ -- Barry Warsaw <barry at debian.org> Sat, 21 Jun 2014 17:43:06 -0400
+
tox (1.7.1-2) unstable; urgency=medium
* d/changelog: Fix closed bug number typo.
@@ -16,7 +23,7 @@
- Add X-Python3-Version header and remove X-Python-Version header.
- Bump Standards-Version to 3.9.5 with no other changes necessary.
- Fix virtualenv dependency. Closes: #751193
- * d/rules:
+ * d/rules:
- Switch to Python 3. Closes: #746236
- override_dh_auto_clean removes .tox directory. Closes: #751803
* d/tests
Modified: packages/tox/trunk/debian/patches/build-time-tests.patch
===================================================================
--- packages/tox/trunk/debian/patches/build-time-tests.patch 2014-06-21 19:38:57 UTC (rev 10987)
+++ packages/tox/trunk/debian/patches/build-time-tests.patch 2014-06-21 22:44:21 UTC (rev 10988)
@@ -22,7 +22,7 @@
config = newconfig([], inisource)
assert config.envconfigs['hello'].recreate
-+ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
++ 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")
@@ -37,7 +37,7 @@
"*created sdist package at*",
])
-+ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
++ 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"},
@@ -45,7 +45,7 @@
])
assert result.ret
-+ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
++ 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"},
@@ -53,7 +53,7 @@
"*ERROR*unknown*",
])
-+ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
++ 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"},
@@ -61,7 +61,7 @@
"*ERROR*InterpreterNotFound*xyz_unknown_interpreter*",
])
-+ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
++ 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"},
@@ -69,7 +69,7 @@
"*ERROR*could not install*qweqwe123*",
])
-+ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
++ 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': ''
@@ -77,7 +77,7 @@
"*ERROR*unknown*environment*qpwoei*",
])
-+ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
++ 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"},
@@ -85,7 +85,7 @@
result = cmd.run("tox", )
assert result.ret == 0
-+ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
++ 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"},
@@ -93,7 +93,7 @@
"*ERROR*empty*",
])
-+ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
++ 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"},
@@ -101,7 +101,7 @@
"*ERROR*empty*",
])
-+ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
++ 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"},
@@ -109,7 +109,7 @@
"*ERROR*check setup.py*",
])
-+ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
++ 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"},
@@ -117,7 +117,7 @@
"*FAIL*could not package project*",
])
-+ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
++ 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"},
@@ -125,15 +125,24 @@
-+ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'), reason='Use DEP-8')
class TestToxRun:
@pytest.fixture
def example123(self, initproj):
+@@ -376,7 +389,7 @@
+ changedir=tests
+ commands= py.test --basetemp={envtmpdir} \
+ --junitxml=junit-{envname}.xml
+- deps=pytest
++ sitepackages=True
+ '''
+ })
+
@@ -423,6 +436,7 @@
])
-+ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
++ 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': """
"""})
@@ -141,7 +150,7 @@
assert not result.ret
assert "sdist-make" not in result.stdout.str()
-+ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
++ 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]
@@ -149,7 +158,7 @@
assert not result.ret
assert "sdist-make" not in result.stdout.str()
-+ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
++ 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]
@@ -157,15 +166,24 @@
assert not result.ret
assert "sdist-make" in result.stdout.str()
-+ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
++ 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': """
+@@ -470,7 +487,7 @@
+ changedir=tests
+ commands=
+ py.test --basetemp={envtmpdir} --junitxml=junit-{envname}.xml []
+- deps=pytest
++ sitepackages=True
+ '''
+ })
+ result = cmd.run("tox", "-v")
@@ -510,6 +527,7 @@
])
-+ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
++ 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
@@ -173,7 +191,7 @@
result = cmd.run("tox")
assert not result.ret
-+ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
++ 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
@@ -181,7 +199,7 @@
"*py26*reusing*",
])
-+ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
++ 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)
@@ -189,7 +207,7 @@
"*create*",
])
-+ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
++ 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')
@@ -197,7 +215,7 @@
"*create*",
])
-+ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
++ 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': """
"""})
@@ -205,7 +223,7 @@
])
assert "virtualenv" not in result.stdout.str()
-+ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
++ 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={
@@ -213,7 +231,7 @@
assert len(l) == 1
sdistfile = l[0]
-+ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
++ 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={
@@ -221,7 +239,7 @@
sdist_path = session.sdist()
assert sdist_path == p
-+ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'))
++ 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):
Modified: packages/tox/trunk/debian/tests/control
===================================================================
--- packages/tox/trunk/debian/tests/control 2014-06-21 19:38:57 UTC (rev 10987)
+++ packages/tox/trunk/debian/tests/control 2014-06-21 22:44:21 UTC (rev 10988)
@@ -1,2 +1,2 @@
Tests: built
-Depends: @, python3-all, python3-pytest, python-virtualenv, python3-pip
+Depends: @, python3-all, python3-pytest, python3-pip, virtualenv, python-pytest
More information about the Python-apps-commits
mailing list