diff options
| author | holger krekel <holger@merlinux.eu> | 2015-02-21 20:33:15 +0100 |
|---|---|---|
| committer | holger krekel <holger@merlinux.eu> | 2015-02-21 20:33:15 +0100 |
| commit | 152f30d55d68973356083521523e47a2796d45c6 (patch) | |
| tree | 9cf1df8d179feffef131d5db3a7ca2b0d5d0fb5d /tox/_config.py | |
| parent | eca4bc058aae8beed720d71b0b4803fc05c26005 (diff) | |
| parent | 192089fb9a72e4247489a9d841827d3d2ec8da1d (diff) | |
| download | tox-152f30d55d68973356083521523e47a2796d45c6.tar.gz | |
Merged in suor/tox/issue198 (pull request #129)
Diffstat (limited to 'tox/_config.py')
| -rw-r--r-- | tox/_config.py | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/tox/_config.py b/tox/_config.py index 82154e3..3d26686 100644 --- a/tox/_config.py +++ b/tox/_config.py @@ -18,7 +18,7 @@ iswin32 = sys.platform == "win32" default_factors = {'jython': 'jython', 'pypy': 'pypy', 'pypy3': 'pypy3', 'py': sys.executable} -for version in '24,25,26,27,30,31,32,33,34'.split(','): +for version in '24,25,26,27,30,31,32,33,34,35'.split(','): default_factors['py' + version] = 'python%s.%s' % tuple(version) def parseconfig(args=None, pkg=None): @@ -287,10 +287,18 @@ class parseini: config.envlist, all_envs = self._getenvdata(reader, toxsection) - # configure testenvs + # factors used in config or predefined known_factors = self._list_section_factors("testenv") known_factors.update(default_factors) known_factors.add("python") + + # factors stated in config envlist + stated_envlist = reader.getdefault(toxsection, "envlist", replace=False) + if stated_envlist: + for env in _split_env(stated_envlist): + known_factors.update(env.split('-')) + + # configure testenvs for name in all_envs: section = testenvprefix + name factors = set(name.split('-')) @@ -395,6 +403,8 @@ class parseini: vc.pip_pre = config.option.pre or reader.getbool( section, "pip_pre", False) + vc.skip_install = reader.getbool(section, "skip_install", False) + return vc def _getenvdata(self, reader, toxsection): |