Travis: be friendlier: generate less envs

This reverts bc001fd / 464f8b5.

Ref: pytest-dev@bc001fd#commitcomment-12362388

Author: blueyed

.travis.yml

@@ -23,10 +23,6 @@ env:
   - TESTENV=python3.4-1.7-sqlite_file
   - TESTENV=python3.4-1.8-sqlite_file
   - TESTENV=python3.4-master-sqlite_file
-  - TESTENV=python3.5-1.5-sqlite_file
-  - TESTENV=python3.5-1.6-sqlite_file
-  - TESTENV=python3.5-1.7-sqlite_file
-  - TESTENV=python3.5-1.8-sqlite_file
   - TESTENV=python3.5-master-postgres
   - TESTENV=python3.5-master-sqlite
   - TESTENV=python3.5-master-sqlite_file

generate_configurations.py

@@ -165,10 +165,14 @@ def generate_default_envs(envs):
 
     def find_and_add(variations, env_getter):
         for variation in variations:
-            for env in reversed(envs):
-                if env_getter(env) == variation:
-                    result.add(env)
+            for existing in result:
+                if env_getter(existing) == variation:
                     break
+            else:
+                for env in reversed(envs):
+                    if env_getter(env) == variation:
+                        result.add(env)
+                        break
 
     # Add all Django versions for each main python version (2.x and 3.x).
     find_and_add(itertools.product(PYTHON_MAIN_VERSIONS, DJANGO_VERSIONS),

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = pypy-master-sqlite_file,pypy3-1.8-sqlite_file,python2.6-1.6-sqlite_file,python2.7-1.3-sqlite_file,python2.7-1.4-sqlite_file,python2.7-1.5-sqlite_file,python2.7-1.6-sqlite_file,python2.7-1.7-sqlite_file,python2.7-1.8-sqlite_file,python2.7-master-mysql_innodb,python2.7-master-mysql_myisam,python2.7-master-sqlite_file,python3.2-1.6-sqlite_file,python3.3-1.6-sqlite_file,python3.4-1.5-sqlite_file,python3.4-1.6-sqlite_file,python3.4-1.7-sqlite_file,python3.4-1.8-sqlite_file,python3.4-master-sqlite_file,python3.5-1.5-sqlite_file,python3.5-1.6-sqlite_file,python3.5-1.7-sqlite_file,python3.5-1.8-sqlite_file,python3.5-master-postgres,python3.5-master-sqlite,python3.5-master-sqlite_file,checkqa-python2.7,checkqa-python3.4
+envlist = pypy-master-sqlite_file,pypy3-1.8-sqlite_file,python2.6-1.6-sqlite_file,python2.7-1.3-sqlite_file,python2.7-1.4-sqlite_file,python2.7-1.5-sqlite_file,python2.7-1.6-sqlite_file,python2.7-1.7-sqlite_file,python2.7-1.8-sqlite_file,python2.7-master-mysql_innodb,python2.7-master-mysql_myisam,python2.7-master-sqlite_file,python3.2-1.6-sqlite_file,python3.3-1.6-sqlite_file,python3.4-1.5-sqlite_file,python3.4-1.6-sqlite_file,python3.4-1.7-sqlite_file,python3.4-1.8-sqlite_file,python3.4-master-sqlite_file,python3.5-master-postgres,python3.5-master-sqlite,python3.5-master-sqlite_file,checkqa-python2.7,checkqa-python3.4
 
 [testenv]
 whitelist_externals =