Skip to content

Commit

Permalink
Fix typo(?) in b943a9d which caused
Browse files Browse the repository at this point in the history 
some envs not to be included in builds.
  • Loading branch information
@pelme
pelme committed Jul 26, 2015
1 parent fa752eb commit bc001fd
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
11 changes: 11 additions & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,36 @@ language: python
python:
- "3.4"
env:
- TESTENV=pypy-master-sqlite_file
- TESTENV=pypy3-1.8-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-1.5-sqlite_file
- TESTENV=python2.7-1.6-sqlite_file
- TESTENV=python2.7-1.7-sqlite_file
- TESTENV=python2.7-1.8-sqlite_file
- TESTENV=python2.7-master-mysql_innodb
- TESTENV=python2.7-master-mysql_myisam
- TESTENV=python2.7-master-sqlite_file
- TESTENV=python3.2-1.6-sqlite_file
- TESTENV=python3.3-1.6-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.7
- TESTENV=checkqa-python3.4
matrix:
allow_failures:
- env: TESTENV=pypy-master-sqlite_file
- env: TESTENV=python2.7-master-mysql_innodb
- env: TESTENV=python2.7-master-mysql_myisam
- env: TESTENV=python2.7-master-sqlite_file
- env: TESTENV=python3.4-master-postgres
- env: TESTENV=python3.4-master-sqlite
- env: TESTENV=python3.4-master-sqlite_file
install:
Expand Down
2 changes: 1 addition & 1 deletion generate_configurations.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ def find_and_add(variations, env_getter):
for variation in variations:
for existing in result:
if env_getter(existing) == variation:
return
break

This comment has been minimized.

Sign in to view

Copy link
@pelme

pelme Jul 26, 2015

Author Member

@blueyed It should be like this, right? b943a9d seems to remove too many envs or was that the intended change?

Travis has for some reason not picked up pushes to master the latest couple of months, it should now be fixed.

This comment has been minimized.

Sign in to view

Copy link
@pelme

pelme Jul 26, 2015

Author Member

@blueyed I think it should not be there, I removed that section in 464f8b5 and it did not affect the test envs. Feel free to correct me/revert this if I broke something that you intended to change!

This comment has been minimized.

Sign in to view

Copy link
@blueyed

blueyed Jul 26, 2015

Contributor

@pelme
IIRC the intention was to remove redundant combinations, as per the methods doc:

Returns a list of testenvs that include all different Python versions, all Django versions and all database backends.

The aim was to be more friendly to Travis.

for env in reversed(envs):
if env_getter(env) == variation:
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
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
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

[testenv]
whitelist_externals =
Expand Down

0 comments on commit bc001fd

Please sign in to comment.