14
0
forked from pool/python-tox

Accepting request 358395 from home:tbechtold:branches:devel:languages:python

- 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

OBS-URL: https://build.opensuse.org/request/show/358395
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-tox?expand=0&rev=25
This commit is contained in:
2016-02-09 09:48:25 +00:00
committed by Git OBS Bridge
parent 1fba98acab
commit 5d19a76909
5 changed files with 95 additions and 16 deletions

View File

@@ -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__