1 new commit in tox:
https://bitbucket.org/hpk42/tox/commits/bfb25dfb2e53/
Changeset: bfb25dfb2e53
User: hpk42
Date: 2015-11-09 10:26:26+00:00
Summary: fix issue280: fix case where --skip-missing-interpreter would not
work if {envsitepackagesdir} substitution was used.
Affected #: 3 files
diff -r 618ba985f95889a793c2c367f92f4954f0cdd159 -r
bfb25dfb2e53f56d4d85cbd68b7af3c78538c88c CHANGELOG
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -19,6 +19,9 @@
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
+
2.1.1
----------
diff -r 618ba985f95889a793c2c367f92f4954f0cdd159 -r
bfb25dfb2e53f56d4d85cbd68b7af3c78538c88c tests/test_z_cmdline.py
--- a/tests/test_z_cmdline.py
+++ b/tests/test_z_cmdline.py
@@ -692,8 +692,7 @@
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': """
@@ -708,6 +707,22 @@
""")
+@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__
diff -r 618ba985f95889a793c2c367f92f4954f0cdd159 -r
bfb25dfb2e53f56d4d85cbd68b7af3c78538c88c tox/config.py
--- a/tox/config.py
+++ b/tox/config.py
@@ -539,7 +539,6 @@
""" return sitepackagesdir of the virtualenv environment.
(only available during execution, not parsing)
"""
- self.getsupportedinterpreter() # for throwing exceptions
x = self.config.interpreters.get_sitepackagesdir(
info=self.python_info,
envdir=self.envdir)
Repository URL: https://bitbucket.org/hpk42/tox/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
pytest-commit mailing list
pytest-commit@python.org
https://mail.python.org/mailman/listinfo/pytest-commit
