From 9e58e5f1701d96d79c2125778f2024d41077a581947b0e4276f7c20cc4e44363 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 25 Aug 2014 09:21:10 +0000 Subject: [PATCH] Accepting request 246192 from home:a_jaeger:FactoryFix - Update to version 1.7.2: * fix issue150: parse {posargs} more like we used to do it pre 1.7.0. * fix issue59: add a config variable skip-missing-interpreters as well as command line option --skip-missing-interpreters * fix issue164: better traceback info in case of failing test commands * support optional env variable substitution. * limit python hashseed to 1024 on Windows to prevent possible memory errors. OBS-URL: https://build.opensuse.org/request/show/246192 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-tox?expand=0&rev=19 --- python-tox.changes | 13 ++++++++++++ python-tox.spec | 2 +- tox-1.7.1.tar.gz | 3 --- tox-1.7.2.tar.gz | 3 +++ tox-disable-env-tests.patch | 41 ++++++++++++++++++++++++++++++------- 5 files changed, 51 insertions(+), 11 deletions(-) delete mode 100644 tox-1.7.1.tar.gz create mode 100644 tox-1.7.2.tar.gz diff --git a/python-tox.changes b/python-tox.changes index a35ad4f..bbcc18f 100644 --- a/python-tox.changes +++ b/python-tox.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Aug 25 08:36:50 UTC 2014 - aj@suse.com + +- Update to version 1.7.2: + * fix issue150: parse {posargs} more like we used to do it pre + 1.7.0. + * fix issue59: add a config variable skip-missing-interpreters as + well as command line option --skip-missing-interpreters + * fix issue164: better traceback info in case of failing test commands + * support optional env variable substitution. + * limit python hashseed to 1024 on Windows to prevent possible + memory errors. + ------------------------------------------------------------------- Thu Jul 3 11:13:09 UTC 2014 - speilicke@suse.com diff --git a/python-tox.spec b/python-tox.spec index 9447fe9..7cf87fa 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -17,7 +17,7 @@ Name: python-tox -Version: 1.7.1 +Version: 1.7.2 Release: 0 Summary: Virtualenv-based automation of test activities License: MIT diff --git a/tox-1.7.1.tar.gz b/tox-1.7.1.tar.gz deleted file mode 100644 index fbea811..0000000 --- a/tox-1.7.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:869cb9e07847a9f0238f5a5029f3621504a5a3ec05af6d878e879b354c6851c4 -size 84635 diff --git a/tox-1.7.2.tar.gz b/tox-1.7.2.tar.gz new file mode 100644 index 0000000..f215fb1 --- /dev/null +++ b/tox-1.7.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:267fc86871ae2a398d3e7b4b03e8113b3305533c72ef8de616cbc7258039f1f8 +size 84875 diff --git a/tox-disable-env-tests.patch b/tox-disable-env-tests.patch index 7b0143e..dc88e31 100644 --- a/tox-disable-env-tests.patch +++ b/tox-disable-env-tests.patch @@ -86,13 +86,12 @@ diff -ruN a/tests/test_config.py b/tests/test_config.py def test_dash_e_single_1(self): diff -ruN a/tests/test_z_cmdline.py b/tests/test_z_cmdline.py ---- a/tests/test_z_cmdline.py 2014-03-28 15:18:52.000000000 +0100 -+++ b/tests/test_z_cmdline.py 1970-01-01 01:00:00.000000000 +0100 -@@ -1,658 +0,0 @@ +--- a/tests/test_z_cmdline.py 2014-07-15 09:22:26.000000000 +0200 ++++ b/tests/test_z_cmdline.py 2014-08-19 12:03:19.023707261 +0200 +@@ -1,685 +0,0 @@ -import tox -import py -import pytest --import sys -from tox._pytestplugin import ReportExpectMock -try: - import json @@ -220,7 +219,6 @@ diff -ruN a/tests/test_z_cmdline.py b/tests/test_z_cmdline.py - }) - config = parseconfig([]) - session = Session(config) -- envlist = ['hello', 'world'] - envs = session.venvlist - assert len(envs) == 2 - env1, env2 = envs @@ -284,6 +282,19 @@ diff -ruN a/tests/test_z_cmdline.py b/tests/test_z_cmdline.py - ]) - assert result.ret - +-def test_run_custom_install_command_error(cmd, initproj): +- initproj("interp123-0.5", filedefs={ +- 'tox.ini': ''' +- [testenv] +- install_command=./tox.ini {opts} {packages} +- ''' +- }) +- result = cmd.run("tox") +- result.stdout.fnmatch_lines([ +- "ERROR: invocation failed, args: ['*/tox.ini*", +- ]) +- assert result.ret +- -def test_unknown_interpreter_and_env(cmd, initproj): - initproj("interp123-0.5", filedefs={ - 'tests': {'test_hello.py': "def test_hello(): pass"}, @@ -322,6 +333,22 @@ diff -ruN a/tests/test_z_cmdline.py b/tests/test_z_cmdline.py - "*ERROR*InterpreterNotFound*xyz_unknown_interpreter*", - ]) - +-def test_skip_unknown_interpreter(cmd, initproj): +- initproj("interp123-0.5", filedefs={ +- 'tests': {'test_hello.py': "def test_hello(): pass"}, +- 'tox.ini': ''' +- [testenv:python] +- basepython=xyz_unknown_interpreter +- [testenv] +- changedir=tests +- ''' +- }) +- result = cmd.run("tox", "--skip-missing-interpreters") +- assert not result.ret +- result.stdout.fnmatch_lines([ +- "*SKIPPED*InterpreterNotFound*xyz_unknown_interpreter*", +- ]) +- -def test_unknown_dep(cmd, initproj): - initproj("dep123-0.7", filedefs={ - 'tests': {'test_hello.py': "def test_hello(): pass"}, @@ -658,7 +685,7 @@ diff -ruN a/tests/test_z_cmdline.py b/tests/test_z_cmdline.py - result.stdout.fnmatch_lines([ - "*sdist-make*setup.py*", - ]) -- assert "virtualenv" not in result.stdout.str() +- assert "-mvirtualenv" not in result.stdout.str() - -def test_separate_sdist_no_sdistfile(cmd, initproj): - distshare = cmd.tmpdir.join("distshare") @@ -673,6 +700,7 @@ diff -ruN a/tests/test_z_cmdline.py b/tests/test_z_cmdline.py - l = distshare.listdir() - assert len(l) == 1 - sdistfile = l[0] +- assert 'pkg123-0.7.zip' in str(sdistfile) - -def test_separate_sdist(cmd, initproj): - distshare = cmd.tmpdir.join("distshare") @@ -702,7 +730,6 @@ diff -ruN a/tests/test_z_cmdline.py b/tests/test_z_cmdline.py - distshare=%s - sdistsrc={distshare}/pkg123-* - """ % distshare) -- p0 = distshare.ensure("pkg123-1.3.5.zip") - p = distshare.ensure("pkg123-1.4.5.zip") - distshare.ensure("pkg123-1.4.5a1.zip") - session = Session(config)