generate_configurations: do not add pytest_version to env

Leave out pytest_version, if there's only a single one being used.

Author: blueyed

.travis.yml

@@ -2,23 +2,23 @@ language: python
 python:
   - "3.4"
 env:
-  - TESTENV=pypy-2.6.4-master-sqlite_file
-  - TESTENV=pypy3-2.6.4-master-sqlite_file
-  - TESTENV=python2.6-2.6.4-1.6-sqlite_file
-  - TESTENV=python2.7-2.6.4-1.3-sqlite_file
-  - TESTENV=python2.7-2.6.4-1.4-sqlite_file
-  - TESTENV=python2.7-2.6.4-master-mysql_innodb
-  - TESTENV=python2.7-2.6.4-master-mysql_myisam
-  - TESTENV=python2.7-2.6.4-master-sqlite_file
-  - TESTENV=python3.2-2.6.4-master-sqlite_file
-  - TESTENV=python3.3-2.6.4-master-sqlite_file
-  - TESTENV=python3.4-2.6.4-1.5-sqlite_file
-  - TESTENV=python3.4-2.6.4-1.6-sqlite_file
-  - TESTENV=python3.4-2.6.4-1.7-sqlite_file
-  - TESTENV=python3.4-2.6.4-1.8-sqlite_file
-  - TESTENV=python3.4-2.6.4-master-postgres
-  - TESTENV=python3.4-2.6.4-master-sqlite
-  - TESTENV=python3.4-2.6.4-master-sqlite_file
+  - TESTENV=pypy-master-sqlite_file
+  - TESTENV=pypy3-master-sqlite_file
+  - TESTENV=python2.6-1.6-sqlite_file
+  - TESTENV=python2.7-1.3-sqlite_file
+  - TESTENV=python2.7-1.4-sqlite_file
+  - TESTENV=python2.7-master-mysql_innodb
+  - TESTENV=python2.7-master-mysql_myisam
+  - TESTENV=python2.7-master-sqlite_file
+  - TESTENV=python3.2-master-sqlite_file
+  - TESTENV=python3.3-master-sqlite_file
+  - TESTENV=python3.4-1.5-sqlite_file
+  - TESTENV=python3.4-1.6-sqlite_file
+  - TESTENV=python3.4-1.7-sqlite_file
+  - TESTENV=python3.4-1.8-sqlite_file
+  - TESTENV=python3.4-master-postgres
+  - TESTENV=python3.4-master-sqlite
+  - TESTENV=python3.4-master-sqlite_file
   - TESTENV=checkqa-python2.6
   - TESTENV=checkqa-python2.7
   - TESTENV=checkqa-python3.2

generate_configurations.py

@@ -113,6 +113,8 @@ def commands(uid, env):
 
 
 def testenv_name(env):
+    if len(PYTEST_VERSIONS) == 1:
+        env = [getattr(env, x) for x in env._fields if x != 'pytest_version']
     return '-'.join(env)