diff --git a/python-tox.changes b/python-tox.changes index af33294..fc3004e 100644 --- a/python-tox.changes +++ b/python-tox.changes @@ -1,3 +1,49 @@ +------------------------------------------------------------------- +Mon Feb 8 16:58:52 UTC 2016 - tbechtold@suse.com + +- update to 2.3.1: + * fix issue294: re-allow cross-section substitution for setenv. + * DEPRECATE use of "indexservers" in tox.ini. It complicates + the internal code and it is recommended to rather use the + devpi system for managing indexes for pip. + * fix issue285: make setenv processing fully lazy to fix regressions + of tox-2.2.X and so that we can now have testenv attributes like + "basepython" depend on environment variables that are set in + a setenv section. Thanks Nelfin for some tests and initial + work on a PR. + * allow "#" in commands. This is slightly incompatible with commands + sections that used a comment after a "\" line continuation. + Thanks David Stanek for the PR. + * fix issue289: fix build_sphinx target, thanks Barry Warsaw. + * fix issue252: allow environment names with special characters. + Thanks Julien Castets for initial PR and patience. + * introduce experimental tox_testenv_create(venv, action) and + tox_testenv_install_deps(venv, action) hooks to allow + plugins to do additional work on creation or installing + deps. These hooks are experimental mainly because of + the involved "venv" and session objects whose current public + API is not fully guranteed. + * internal: push some optional object creation into tests because + tox core doesn't need it. + * fix bug where {envdir} substitution could not be used in setenv + if that env value is then used in {basepython}. Thanks Florian Bruhin. + * fix issue265 and add LD_LIBRARY_PATH to passenv on linux by default + because otherwise the python interpreter might not start up in + certain configurations (redhat software collections). Thanks David Riddle. + * fix issue246: fix regression in config parsing by reordering + such that {envbindir} can be used again in tox.ini. Thanks Olli Walsh. + * fix issue99: the {env:...} substitution now properly uses environment + settings from the ``setenv`` section. Thanks Itxaka Serrano. + * fix issue281: make --force-deps work when urls are present in + dependency configs. Thanks Glyph Lefkowitz for reporting. + * fix issue174: add new ``ignore_outcome`` testenv attribute which + can be set to True in which case it will produce a warning instead + of an error on a failed testenv command outcome. + Thanks Rebecka Gulliksson for the PR. + * fix issue280: properly skip missing interpreter if + {envsitepackagesdir} is present in commands. Thanks BB:ceridwenv +- Refresh tox-disable-env-tests.patch + ------------------------------------------------------------------- Wed Sep 16 13:18:44 UTC 2015 - rhafer@suse.com diff --git a/python-tox.spec b/python-tox.spec index 3ae1272..ff96ada 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -1,7 +1,7 @@ # # spec file for package python-tox # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: python-tox -Version: 2.1.1 +Version: 2.3.1 Release: 0 Summary: Virtualenv-based automation of test activities License: MIT diff --git a/tox-2.1.1.tar.gz b/tox-2.1.1.tar.gz deleted file mode 100644 index c45d1eb..0000000 --- a/tox-2.1.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a03aa022a1f6f82cc21732af0ed48217a3c16873b98e16be22baa7cea74e1eef -size 102170 diff --git a/tox-2.3.1.tar.gz b/tox-2.3.1.tar.gz new file mode 100644 index 0000000..cdc5385 --- /dev/null +++ b/tox-2.3.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bf7fcc140863820700d3ccd65b33820ba747b61c5fe4e2b91bb8c64cb21a47ee +size 106447 diff --git a/tox-disable-env-tests.patch b/tox-disable-env-tests.patch index ddf2189..b7ace08 100644 --- a/tox-disable-env-tests.patch +++ b/tox-disable-env-tests.patch @@ -1,8 +1,8 @@ -Index: tox-2.1.1/tests/test_config.py +Index: tox-2.3.1/tests/test_config.py =================================================================== ---- tox-2.1.1.orig/tests/test_config.py -+++ tox-2.1.1/tests/test_config.py -@@ -1575,84 +1575,6 @@ class TestParseEnv: +--- tox-2.3.1.orig/tests/test_config.py ++++ tox-2.3.1/tests/test_config.py +@@ -1784,84 +1784,6 @@ class TestParseEnv: assert config.envconfigs['hello'].recreate @@ -87,11 +87,11 @@ Index: tox-2.1.1/tests/test_config.py @pytest.mark.parametrize("cmdline,envlist", [ ("-e py26", ['py26']), ("-e py26,py33", ['py26', 'py33']), -Index: tox-2.1.1/tests/test_z_cmdline.py +Index: tox-2.3.1/tests/test_z_cmdline.py =================================================================== ---- tox-2.1.1.orig/tests/test_z_cmdline.py -+++ tox-2.1.1/tests/test_z_cmdline.py -@@ -1,727 +0,0 @@ +--- tox-2.3.1.orig/tests/test_z_cmdline.py ++++ tox-2.3.1/tests/test_z_cmdline.py +@@ -1,760 +0,0 @@ -import tox -import py -import pytest @@ -128,7 +128,8 @@ Index: tox-2.1.1/tests/test_z_cmdline.py - report = session.report - report.expect("using") - venv = session.getvenv("mypython") -- venv.update() +- action = session.newaction(venv, "update") +- venv.update(action) - report.expect("logpopen") - - @@ -395,6 +396,23 @@ Index: tox-2.1.1/tests/test_z_cmdline.py - ]) - - +-def test_venv_special_chars_issue252(cmd, initproj): +- initproj("pkg123-0.7", filedefs={ +- 'tests': {'test_hello.py': "def test_hello(): pass"}, +- 'tox.ini': ''' +- [tox] +- envlist = special&&1 +- [testenv:special&&1] +- changedir=tests +- ''' +- }) +- result = cmd.run("tox", ) +- assert result.ret == 0 +- result.stdout.fnmatch_lines([ +- "*installed*pkg123*" +- ]) +- +- -def test_unknown_environment(cmd, initproj): - initproj("env123-0.7", filedefs={ - 'tox.ini': '' @@ -786,8 +804,7 @@ Index: tox-2.1.1/tests/test_z_cmdline.py - assert sdist_path == p - - --@pytest.mark.xfail("sys.platform == 'win32' and sys.version_info < (2,6)", -- reason="test needs better impl") +-@pytest.mark.xfail("sys.platform == 'win32'", reason="test needs better impl") -def test_envsitepackagesdir(cmd, initproj): - initproj("pkg512-0.0.5", filedefs={ - 'tox.ini': """ @@ -802,6 +819,22 @@ Index: tox-2.1.1/tests/test_z_cmdline.py - """) - - +-@pytest.mark.xfail("sys.platform == 'win32'", reason="test needs better impl") +-def test_envsitepackagesdir_skip_missing_issue280(cmd, initproj): +- initproj("pkg513-0.0.5", filedefs={ +- 'tox.ini': """ +- [testenv] +- basepython=/usr/bin/qwelkjqwle +- commands= +- {envsitepackagesdir} +- """}) +- result = cmd.run("tox", "--skip-missing-interpreters") +- assert result.ret == 0 +- result.stdout.fnmatch_lines(""" +- SKIPPED:*qwelkj* +- """) +- +- -def verify_json_report_format(data, testenvs=True): - assert data["reportversion"] == "1" - assert data["toxversion"] == tox.__version__