2 new commits in tox:
https://bitbucket.org/hpk42/tox/commits/7562481b0c4b/
Changeset: 7562481b0c4b
User: acaron
Date: 2015-06-05 03:37:44+00:00
Summary: Adds support for multiline envlist setting.
Affected #: 2 files
diff -r 93f262ca702e8d2e1192875ded9eaa584de3aa00 -r
7562481b0c4bb28fa100ba65b05202f4fa10f1ca tests/test_config.py
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -1273,6 +1273,17 @@
assert config.envlist == \
["py26-dep1", "py26-dep2", "py27-dep1", "py27-dep2"]
+ def test_envlist_multiline(self, newconfig):
+ inisource = """
+ [tox]
+ envlist =
+ py27
+ py34
+ """
+ config = newconfig([], inisource)
+ assert config.envlist == \
+ ["py27", "py34"]
+
def test_minversion(self, tmpdir, newconfig, monkeypatch):
inisource = """
[tox]
diff -r 93f262ca702e8d2e1192875ded9eaa584de3aa00 -r
7562481b0c4bb28fa100ba65b05202f4fa10f1ca tox/config.py
--- a/tox/config.py
+++ b/tox/config.py
@@ -731,6 +731,8 @@
def _split_env(env):
"""if handed a list, action="append" was used for -e """
if not isinstance(env, list):
+ if '\n' in env:
+ env = ','.join(env.split('\n'))
env = [env]
return mapcat(_expand_envstr, env)
https://bitbucket.org/hpk42/tox/commits/b4480d153f61/
Changeset: b4480d153f61
User: hpk42
Date: 2015-06-19 09:13:38+00:00
Summary: Merged in acaron/tox (pull request #163)
Adds support for multiline envlist setting.
Affected #: 2 files
diff -r a04c5bcd5ae6eebc6c386a77b175a3df99699f20 -r
b4480d153f612b6773a4bdac829b211277faf0dc tests/test_config.py
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -1323,6 +1323,17 @@
assert config.envlist == \
["py26-dep1", "py26-dep2", "py27-dep1", "py27-dep2"]
+ def test_envlist_multiline(self, newconfig):
+ inisource = """
+ [tox]
+ envlist =
+ py27
+ py34
+ """
+ config = newconfig([], inisource)
+ assert config.envlist == \
+ ["py27", "py34"]
+
def test_minversion(self, tmpdir, newconfig, monkeypatch):
inisource = """
[tox]
diff -r a04c5bcd5ae6eebc6c386a77b175a3df99699f20 -r
b4480d153f612b6773a4bdac829b211277faf0dc tox/config.py
--- a/tox/config.py
+++ b/tox/config.py
@@ -733,6 +733,8 @@
def _split_env(env):
"""if handed a list, action="append" was used for -e """
if not isinstance(env, list):
+ if '\n' in env:
+ env = ','.join(env.split('\n'))
env = [env]
return mapcat(_expand_envstr, env)
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
