4 new commits in tox:
https://bitbucket.org/hpk42/tox/commits/917f3555fde5/
Changeset: 917f3555fde5
Branch: issue198
User: suor
Date: 2014-12-29 10:35:31+00:00
Summary: Fix issue 198: resolve touching factor groups
Affected #: 2 files
diff -r 50f3b98fc65b951ab07e6b5e3fbd5a2fc9c48f2c -r
917f3555fde5596a0c1fe96d3d6d110d63e99aca tests/test_config.py
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -960,6 +960,19 @@
assert configs["py27"].setenv["X"] == "1"
assert "X" not in configs["py26"].setenv
+ @pytest.mark.issue198
+ def test_factors_groups_touch(self, newconfig):
+ inisource="""
+ [tox]
+ envlist = {a,b}{-x,}
+
+ [testenv]
+ deps=
+ a,b,x,y: dep
+ """
+ configs = newconfig([], inisource).envconfigs
+ assert set(configs.keys()) == set(['a', 'a-x', 'b', 'b-x'])
+
def test_period_in_factor(self, newconfig):
inisource="""
[tox]
diff -r 50f3b98fc65b951ab07e6b5e3fbd5a2fc9c48f2c -r
917f3555fde5596a0c1fe96d3d6d110d63e99aca tox/_config.py
--- a/tox/_config.py
+++ b/tox/_config.py
@@ -456,7 +456,7 @@
def _expand_envstr(envstr):
# split by commas not in groups
- tokens = re.split(r'(\{[^}]+\})|,', envstr)
+ tokens = re.split(r'((?:\{[^}]+\})+)|,', envstr)
envlist = [''.join(g).strip()
for k, g in itertools.groupby(tokens, key=bool) if k]
https://bitbucket.org/hpk42/tox/commits/34c4a7c2845b/
Changeset: 34c4a7c2845b
User: hpk42
Date: 2015-02-21 19:33:15+00:00
Summary: Merged in suor/tox/issue198 (pull request #129)
Affected #: 3 files
diff -r 0ebe9e55e8c2e010ddc7e4b10603e3ee0db56a9f -r
34c4a7c2845b87743b56de3dff123fffd6c0d766 tests/test_config.py
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -972,6 +972,19 @@
configs = newconfig([], inisource).envconfigs
assert set(configs.keys()) == set(['py27-a', 'py27-b'])
+ @pytest.mark.issue198
+ def test_factors_groups_touch(self, newconfig):
+ inisource="""
+ [tox]
+ envlist = {a,b}{-x,}
+
+ [testenv]
+ deps=
+ a,b,x,y: dep
+ """
+ configs = newconfig([], inisource).envconfigs
+ assert set(configs.keys()) == set(['a', 'a-x', 'b', 'b-x'])
+
def test_period_in_factor(self, newconfig):
inisource="""
[tox]
diff -r 0ebe9e55e8c2e010ddc7e4b10603e3ee0db56a9f -r
34c4a7c2845b87743b56de3dff123fffd6c0d766 tests/test_quickstart.py
--- a/tests/test_quickstart.py
+++ b/tests/test_quickstart.py
@@ -37,6 +37,7 @@
'Y', # py32
'Y', # py33
'Y', # py34
+ 'Y', # py35
'Y', # pypy
'N', # jython
'py.test', # command to run tests
@@ -54,7 +55,7 @@
# and then run "tox" from this directory.
[tox]
-envlist = py26, py27, py32, py33, py34, pypy
+envlist = py26, py27, py32, py33, py34, py35, pypy
[testenv]
commands = py.test
@@ -77,6 +78,7 @@
'Y', # py32
'Y', # py33
'Y', # py34
+ 'Y', # py35
'Y', # pypy
'N', # jython
'nosetests', # command to run tests
@@ -94,7 +96,7 @@
# and then run "tox" from this directory.
[tox]
-envlist = py26, py27, py32, py33, py34, pypy
+envlist = py26, py27, py32, py33, py34, py35, pypy
[testenv]
commands = nosetests
@@ -117,6 +119,7 @@
'Y', # py32
'Y', # py33
'Y', # py34
+ 'Y', # py35
'Y', # pypy
'N', # jython
'trial', # command to run tests
@@ -134,7 +137,7 @@
# and then run "tox" from this directory.
[tox]
-envlist = py26, py27, py32, py33, py34, pypy
+envlist = py26, py27, py32, py33, py34, py35, pypy
[testenv]
commands = trial
@@ -157,6 +160,7 @@
'Y', # py32
'Y', # py33
'Y', # py34
+ 'Y', # py35
'Y', # pypy
'N', # jython
'py.test', # command to run tests
@@ -173,7 +177,7 @@
# and then run "tox" from this directory.
[tox]
-envlist = py26, py27, py32, py33, py34, pypy
+envlist = py26, py27, py32, py33, py34, py35, pypy
[testenv]
commands = py.test
@@ -272,7 +276,7 @@
# and then run "tox" from this directory.
[tox]
-envlist = py26, py27, py32, py33, py34, pypy, jython
+envlist = py26, py27, py32, py33, py34, py35, pypy, jython
[testenv]
commands = py.test
@@ -295,6 +299,7 @@
'', # py32
'', # py33
'', # py34
+ '', # py35
'', # pypy
'', # jython
'', # command to run tests
@@ -312,7 +317,7 @@
# and then run "tox" from this directory.
[tox]
-envlist = py26, py27, py32, py33, py34, pypy, jython
+envlist = py26, py27, py32, py33, py34, py35, pypy, jython
[testenv]
commands = {envpython} setup.py test
@@ -339,6 +344,7 @@
'', # py32
'', # py33
'', # py34
+ '', # py35
'', # pypy
'', # jython
'', # command to run tests
@@ -357,7 +363,7 @@
# and then run "tox" from this directory.
[tox]
-envlist = py26, py27, py32, py33, py34, pypy, jython
+envlist = py26, py27, py32, py33, py34, py35, pypy, jython
[testenv]
commands = {envpython} setup.py test
@@ -459,6 +465,7 @@
'py32': True,
'py33': True,
'py34': True,
+ 'py35': True,
'pypy': True,
'commands': 'nosetests -v',
'deps': 'nose',
@@ -470,7 +477,7 @@
# and then run "tox" from this directory.
[tox]
-envlist = py27, py32, py33, py34, pypy
+envlist = py27, py32, py33, py34, py35, pypy
[testenv]
commands = nosetests -v
diff -r 0ebe9e55e8c2e010ddc7e4b10603e3ee0db56a9f -r
34c4a7c2845b87743b56de3dff123fffd6c0d766 tox/_config.py
--- a/tox/_config.py
+++ b/tox/_config.py
@@ -466,7 +466,7 @@
def _expand_envstr(envstr):
# split by commas not in groups
- tokens = re.split(r'(\{[^}]+\})|,', envstr)
+ tokens = re.split(r'((?:\{[^}]+\})+)|,', envstr)
envlist = [''.join(g).strip()
for k, g in itertools.groupby(tokens, key=bool) if k]
https://bitbucket.org/hpk42/tox/commits/c728fb2074b3/
Changeset: c728fb2074b3
User: hpk42
Date: 2015-02-21 19:35:40+00:00
Summary: add changelog: fix issue198: fix broken envlist settings, e.g.
{py26,py27}{-lint,}
Affected #: 1 file
diff -r 34c4a7c2845b87743b56de3dff123fffd6c0d766 -r
c728fb2074b35cf2a5d2180b461c977447b09a1a CHANGELOG
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -18,6 +18,9 @@
- fix issue124: ignore command exit codes; when a command has a "-" prefix,
tox will ignore the exit code of that command
+- fix issue198: fix broken envlist settings, e.g. {py26,py27}{-lint,}
+
+
1.8.1
-----------
https://bitbucket.org/hpk42/tox/commits/0a85dfb46090/
Changeset: 0a85dfb46090
User: hpk42
Date: 2015-02-21 19:36:45+00:00
Summary: add changelog: fix issue191: lessen factor-use checks
Affected #: 1 file
diff -r c728fb2074b35cf2a5d2180b461c977447b09a1a -r
0a85dfb460906c3434651b594b591d0426530744 CHANGELOG
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -20,6 +20,8 @@
- fix issue198: fix broken envlist settings, e.g. {py26,py27}{-lint,}
+- fix issue191: lessen factor-use checks
+
1.8.1
-----------
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
