Skip to content

Commit bc001fd

Browse files
committed
Fix typo(?) in b943a9d which caused
some envs not to be included in builds.
1 parent fa752eb commit bc001fd

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

.travis.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,36 @@ language: python
44
python:
55
- "3.4"
66
env:
7+
- TESTENV=pypy-master-sqlite_file
8+
- TESTENV=pypy3-1.8-sqlite_file
79
- TESTENV=python2.6-1.6-sqlite_file
810
- TESTENV=python2.7-1.3-sqlite_file
911
- TESTENV=python2.7-1.4-sqlite_file
1012
- TESTENV=python2.7-1.5-sqlite_file
1113
- TESTENV=python2.7-1.6-sqlite_file
1214
- TESTENV=python2.7-1.7-sqlite_file
1315
- TESTENV=python2.7-1.8-sqlite_file
16+
- TESTENV=python2.7-master-mysql_innodb
17+
- TESTENV=python2.7-master-mysql_myisam
1418
- TESTENV=python2.7-master-sqlite_file
19+
- TESTENV=python3.2-1.6-sqlite_file
20+
- TESTENV=python3.3-1.6-sqlite_file
1521
- TESTENV=python3.4-1.5-sqlite_file
1622
- TESTENV=python3.4-1.6-sqlite_file
1723
- TESTENV=python3.4-1.7-sqlite_file
1824
- TESTENV=python3.4-1.8-sqlite_file
25+
- TESTENV=python3.4-master-postgres
1926
- TESTENV=python3.4-master-sqlite
2027
- TESTENV=python3.4-master-sqlite_file
2128
- TESTENV=checkqa-python2.7
2229
- TESTENV=checkqa-python3.4
2330
matrix:
2431
allow_failures:
32+
- env: TESTENV=pypy-master-sqlite_file
33+
- env: TESTENV=python2.7-master-mysql_innodb
34+
- env: TESTENV=python2.7-master-mysql_myisam
2535
- env: TESTENV=python2.7-master-sqlite_file
36+
- env: TESTENV=python3.4-master-postgres
2637
- env: TESTENV=python3.4-master-sqlite
2738
- env: TESTENV=python3.4-master-sqlite_file
2839
install:

generate_configurations.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ def find_and_add(variations, env_getter):
167167
for variation in variations:
168168
for existing in result:
169169
if env_getter(existing) == variation:
170-
return
170+
break
171171

172172
for env in reversed(envs):
173173
if env_getter(env) == variation:

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = 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-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,python3.4-master-sqlite_file,checkqa-python2.7,checkqa-python3.4
2+
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-postgres,python3.4-master-sqlite,python3.4-master-sqlite_file,checkqa-python2.7,checkqa-python3.4
33

44
[testenv]
55
whitelist_externals =

0 commit comments

Comments
 (0)