summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2015-02-21 20:11:26 +0100
committerholger krekel <holger@merlinux.eu>2015-02-21 20:11:26 +0100
commitd4f1f3bbcb6d976c17bac1d271690941503df913 (patch)
tree7cfed57b21b08970082eb626b3d53c02d6f90bf8
parent655ecc51e9804d98814841f15fdbadae290c97d5 (diff)
parent0f3bde02f072c7b0277ec932543086ea8d4fdf4d (diff)
downloadtox-d4f1f3bbcb6d976c17bac1d271690941503df913.tar.gz
Merged in tseaver/tox/add-py35 (pull request #134)
Add support for 'py35' -> 'python3.5'.
-rw-r--r--tox/_config.py2
-rw-r--r--tox/_quickstart.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/tox/_config.py b/tox/_config.py
index 5f89ec4..55f70bf 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):
diff --git a/tox/_quickstart.py b/tox/_quickstart.py
index 098eb61..e7c4f03 100644
--- a/tox/_quickstart.py
+++ b/tox/_quickstart.py
@@ -56,7 +56,7 @@ except NameError:
term_input = input
-all_envs = ['py26', 'py27', 'py32', 'py33', 'py34', 'pypy', 'jython']
+all_envs = ['py26', 'py27', 'py32', 'py33', 'py34', 'py35', 'pypy', 'jython']
PROMPT_PREFIX = '> '