Skip to content

Commit

Permalink
Specify Python version for tests
Browse files Browse the repository at this point in the history
Python 3.5 is only available if requested, so Python 3.5 tests were
failing. Explicit is better than implicit anyway.
  • Loading branch information
jwhitlock committed Jun 27, 2016
1 parent 3e9bb8c commit 9884555
Showing 1 changed file with 46 additions and 24 deletions.
70 changes: 46 additions & 24 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,35 +3,57 @@ language: python
env:
global:
- COVERAGE=1 RUNTEST_ARGS="-v --noinput"
matrix:
matrix:
include:
# Quality checks
- TOXENV=flake8
- TOXENV=docs
- env: TOXENV=flake8
python: "2.7"
- env: TOXENV=docs
python: "2.7"
# Supported Python / Django versions w/ SQLite
- TOXENV=py27-django-110
- TOXENV=py35-django-110
- TOXENV=py27-django-19
- TOXENV=py35-django-19
- TOXENV=py27-django-18
- TOXENV=py34-django-18
- env: TOXENV=py27-django-110
python: "2.7"
- env: TOXENV=py35-django-110
python: "3.5"
- env: TOXENV=py27-django-19
python: "2.7"
- env: TOXENV=py35-django-19
python: "3.5"
- env: TOXENV=py27-django-18
python: "2.7"
- env: TOXENV=py34-django-18
python: "3.4"
# Test with PostgreSQL
- TOXENV=py27-django-19-postgres DATABASE_URL="postgres://postgres@localhost:5432/py27-django-110-postgres"
- TOXENV=py35-django-19-postgres DATABASE_URL="postgres://postgres@localhost:5432/py35-django-110-postgres"
- TOXENV=py27-django-19-postgres DATABASE_URL="postgres://postgres@localhost:5432/py27-django-19-postgres"
- TOXENV=py35-django-19-postgres DATABASE_URL="postgres://postgres@localhost:5432/py35-django-19-postgres"
- TOXENV=py27-django-18-postgres DATABASE_URL="postgres://postgres@localhost:5432/py27-django-18-postgres"
- env: TOXENV=py27-django-19-postgres DATABASE_URL="postgres://postgres@localhost:5432/py27-django-110-postgres"
python: "2.7"
- env: TOXENV=py35-django-19-postgres DATABASE_URL="postgres://postgres@localhost:5432/py35-django-110-postgres"
python: "3.5"
- env: TOXENV=py27-django-19-postgres DATABASE_URL="postgres://postgres@localhost:5432/py27-django-19-postgres"
python: "2.7"
- env: TOXENV=py35-django-19-postgres DATABASE_URL="postgres://postgres@localhost:5432/py35-django-19-postgres"
python: "3.5"
- env: TOXENV=py27-django-18-postgres DATABASE_URL="postgres://postgres@localhost:5432/py27-django-18-postgres"
python: "2.7"
# Test with MySQL
- TOXENV=py27-django-110-mysql DATABASE_URL="mysql://travis@localhost:3306/py27-django-110-mysql"
- TOXENV=py35-django-110-mysql DATABASE_URL="mysql://travis@localhost:3306/py35-django-110-mysql"
- TOXENV=py27-django-19-mysql DATABASE_URL="mysql://travis@localhost:3306/py27-django-19-mysql"
- TOXENV=py35-django-19-mysql DATABASE_URL="mysql://travis@localhost:3306/py35-django-19-mysql"
- TOXENV=py27-django-18-mysql DATABASE_URL="mysql://travis@localhost:3306/py27-django-18-mysql"
- env: TOXENV=py27-django-110-mysql DATABASE_URL="mysql://travis@localhost:3306/py27-django-110-mysql"
python: "2.7"
- env: TOXENV=py35-django-110-mysql DATABASE_URL="mysql://travis@localhost:3306/py35-django-110-mysql"
python: "3.5"
- env: TOXENV=py27-django-19-mysql DATABASE_URL="mysql://travis@localhost:3306/py27-django-19-mysql"
python: "2.7"
- env: TOXENV=py35-django-19-mysql DATABASE_URL="mysql://travis@localhost:3306/py35-django-19-mysql"
python: "3.5"
- env: TOXENV=py27-django-18-mysql DATABASE_URL="mysql://travis@localhost:3306/py27-django-18-mysql"
python: "2.7"
# Django master is allowed to fail
- TOXENV=py27-django-master
- TOXENV=py35-django-master
- TOXENV=py27-django-master-mysql DATABASE_URL="mysql://travis@localhost:3306/py27-django-master-mysql"
- TOXENV=py35-django-master-postgres DATABASE_URL="postgres://postgres@localhost:5432/py35-django-master-postgres"
matrix:
- env: TOXENV=py27-django-master
python: "2.7"
- env: TOXENV=py35-django-master
python: "3.5"
- env: TOXENV=py27-django-master-mysql DATABASE_URL="mysql://travis@localhost:3306/py27-django-master-mysql"
python: "2.7"
- env: TOXENV=py35-django-master-postgres DATABASE_URL="postgres://postgres@localhost:5432/py35-django-master-postgres"
python: "3.5"
allow_failures:
# Master is allowed to fail
- env: TOXENV=py27-django-master
Expand Down

0 comments on commit 9884555

Please sign in to comment.