4 new commits in tox:
https://bitbucket.org/hpk42/tox/commits/f0f92bd50f69/
Changeset: f0f92bd50f69
Branch: alex_gaynor/allow-in-factor-names-for-multidimensio-1411745805716
User: alex_gaynor
Date: 2014-09-26 15:36:48+00:00
Summary: Allow "." in factor names for multi-dimensional tests.
Affected #: 1 file
diff -r 69a69d68fc4679616daed127e8f5fd66085805c6 -r
f0f92bd50f6933d9b1628a0495f90463f5b96a8f tox/_config.py
--- a/tox/_config.py
+++ b/tox/_config.py
@@ -305,7 +305,7 @@
factors = set()
if section in self._cfg:
for _, value in self._cfg[section].items():
- exprs = re.findall(r'^([\w{},-]+)\:\s+', value, re.M)
+ exprs = re.findall(r'^([\w{}\.,-]+)\:\s+', value, re.M)
factors.update(*mapcat(_split_factor_expr, exprs))
return factors
https://bitbucket.org/hpk42/tox/commits/3390ebf86a52/
Changeset: 3390ebf86a52
Branch: alex_gaynor/allow-in-factor-names-for-multidimensio-1411745805716
User: alex_gaynor
Date: 2014-09-26 19:32:11+00:00
Summary: Added a test for period in factor
Affected #: 1 file
diff -r f0f92bd50f6933d9b1628a0495f90463f5b96a8f -r
3390ebf86a52c1ee7fc7641ebed36a93c568b170 tests/test_config.py
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -909,6 +909,14 @@
configs = newconfig([], inisource).envconfigs
assert configs["py27"].setenv["X"] == "1"
assert "X" not in configs["py26"].setenv
+
+ def test_period_in_factor(self, newconfig):
+ inisource="""
+ [tox]
+ envlist = py27-{django1.6,django1.7}
+ """
+ configs = newconfig([], inisource).envconfigs
+ assert list(configs) == ["py27-django1.6", "py27-django-1.7"]
class TestGlobalOptions:
https://bitbucket.org/hpk42/tox/commits/bd3b538ae259/
Changeset: bd3b538ae259
Branch: alex_gaynor/allow-in-factor-names-for-multidimensio-1411745805716
User: suor
Date: 2014-10-12 15:10:19+00:00
Summary: Recognize period in envnames in factor conditions
Affected #: 2 files
diff -r 3390ebf86a52c1ee7fc7641ebed36a93c568b170 -r
bd3b538ae259bfe60b0a7df0979ee9df2435db6c tests/test_config.py
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -909,14 +909,21 @@
configs = newconfig([], inisource).envconfigs
assert configs["py27"].setenv["X"] == "1"
assert "X" not in configs["py26"].setenv
-
+
def test_period_in_factor(self, newconfig):
inisource="""
- [tox]
- envlist = py27-{django1.6,django1.7}
+ [tox]
+ envlist = py27-{django1.6,django1.7}
+
+ [testenv]
+ deps =
+ django1.6: Django==1.6
+ django1.7: Django==1.7
"""
configs = newconfig([], inisource).envconfigs
- assert list(configs) == ["py27-django1.6", "py27-django-1.7"]
+ assert sorted(configs) == ["py27-django1.6", "py27-django1.7"]
+ assert [d.name for d in configs["py27-django1.6"].deps] \
+ == ["Django==1.6"]
class TestGlobalOptions:
diff -r 3390ebf86a52c1ee7fc7641ebed36a93c568b170 -r
bd3b538ae259bfe60b0a7df0979ee9df2435db6c tox/_config.py
--- a/tox/_config.py
+++ b/tox/_config.py
@@ -642,7 +642,7 @@
def _apply_factors(self, s):
def factor_line(line):
- m = re.search(r'^([\w{},-]+)\:\s+(.+)', line)
+ m = re.search(r'^([\w{}\.,-]+)\:\s+(.+)', line)
if not m:
return line
https://bitbucket.org/hpk42/tox/commits/b50e77c3d2ca/
Changeset: b50e77c3d2ca
User: hpk42
Date: 2014-10-12 15:21:32+00:00
Summary: Merged in
suor/tox/alex_gaynor/allow-in-factor-names-for-multidimensio-1411745805716
(pull request #124)
Finished "." in factor names pull-request
Affected #: 2 files
diff -r e89dddec56e6c5844aeb6cc50ea5e2956f53bca6 -r
b50e77c3d2ca888b609f540176422d79804fd9ae tests/test_config.py
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -910,6 +910,21 @@
assert configs["py27"].setenv["X"] == "1"
assert "X" not in configs["py26"].setenv
+ def test_period_in_factor(self, newconfig):
+ inisource="""
+ [tox]
+ envlist = py27-{django1.6,django1.7}
+
+ [testenv]
+ deps =
+ django1.6: Django==1.6
+ django1.7: Django==1.7
+ """
+ configs = newconfig([], inisource).envconfigs
+ assert sorted(configs) == ["py27-django1.6", "py27-django1.7"]
+ assert [d.name for d in configs["py27-django1.6"].deps] \
+ == ["Django==1.6"]
+
class TestGlobalOptions:
def test_notest(self, newconfig):
diff -r e89dddec56e6c5844aeb6cc50ea5e2956f53bca6 -r
b50e77c3d2ca888b609f540176422d79804fd9ae tox/_config.py
--- a/tox/_config.py
+++ b/tox/_config.py
@@ -305,7 +305,7 @@
factors = set()
if section in self._cfg:
for _, value in self._cfg[section].items():
- exprs = re.findall(r'^([\w{},-]+)\:\s+', value, re.M)
+ exprs = re.findall(r'^([\w{}\.,-]+)\:\s+', value, re.M)
factors.update(*mapcat(_split_factor_expr, exprs))
return factors
@@ -642,7 +642,7 @@
def _apply_factors(self, s):
def factor_line(line):
- m = re.search(r'^([\w{},-]+)\:\s+(.+)', line)
+ m = re.search(r'^([\w{}\.,-]+)\:\s+(.+)', line)
if not m:
return line
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
[email protected]
https://mail.python.org/mailman/listinfo/pytest-commit
