Skip to content

tests/Travis: test against latest pytest 3 #505

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 3, 2017
Merged

tests/Travis: test against latest pytest 3 #505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8550018
tests/Travis: test against latest pytest 3
blueyed Aug 21, 2017
f6dea89
tox: test against latest Django 1.11
blueyed Aug 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,60 +7,60 @@ matrix:
include:

- python: 3.6
env: TOXENV=py36-pytest30-djangomaster-postgres
env: TOXENV=py36-pytest3-djangomaster-postgres
- python: 3.6
env: TOXENV=py36-pytest30-django1.11-postgres
env: TOXENV=py36-pytest3-django1.11-postgres
- python: 3.6
env: TOXENV=py36-pytest30-django1.10-postgres
env: TOXENV=py36-pytest3-django1.10-postgres
- python: 3.6
env: TOXENV=py36-pytest30-django1.9-postgres
env: TOXENV=py36-pytest3-django1.9-postgres
- python: 3.6
env: TOXENV=py36-pytest30-django1.8-postgres
env: TOXENV=py36-pytest3-django1.8-postgres
- python: 3.6
env: TOXENV=py36-checkqa

- python: 3.5
env: TOXENV=py35-pytest30-django1.11-postgres
env: TOXENV=py35-pytest3-django1.11-postgres

- python: 3.4
env: TOXENV=py34-pytest30-django1.11-postgres
env: TOXENV=py34-pytest3-django1.11-postgres

- python: 3.3
env: TOXENV=py34-pytest30-django1.8-postgres
env: TOXENV=py34-pytest3-django1.8-postgres

- python: 2.7
env: TOXENV=py27-pytest30-django1.11-mysql_innodb
env: TOXENV=py27-pytest3-django1.11-mysql_innodb
- python: 2.7
env: TOXENV=py27-pytest30-django1.11-mysql_myisam
env: TOXENV=py27-pytest3-django1.11-mysql_myisam
- python: 2.7
env: TOXENV=py27-pytest30-django1.11-postgres
env: TOXENV=py27-pytest3-django1.11-postgres
- python: 2.7
env: TOXENV=py27-pytest30-django1.10-postgres
env: TOXENV=py27-pytest3-django1.10-postgres
- python: 2.7
env: TOXENV=py27-pytest30-django1.9-postgres
env: TOXENV=py27-pytest3-django1.9-postgres
- python: 2.7
env: TOXENV=py27-pytest30-django1.8-postgres
env: TOXENV=py27-pytest3-django1.8-postgres
- python: 2.7
env: TOXENV=py27-pytest30-django1.7-postgres
env: TOXENV=py27-pytest3-django1.7-postgres
- python: 2.7
env: TOXENV=py27-checkqa

- python: pypy
env: TOXENV=pypy-pytest30-django1.11-sqlite_file
env: TOXENV=pypy-pytest3-django1.11-sqlite_file

- python: pypy3
env: TOXENV=pypy3-pytest30-django1.8-sqlite
env: TOXENV=pypy3-pytest3-django1.8-sqlite
- python: pypy3
env: TOXENV=pypy3-pytest30-django1.10-sqlite_file
env: TOXENV=pypy3-pytest3-django1.10-sqlite_file

allow_failures:
- env: TOXENV=py36-pytest30-djangomaster-postgres
- env: TOXENV=py36-pytest3-djangomaster-postgres

# Temporary.
# https://github.com/pytest-dev/pytest-django/pull/445
# https://github.com/pytest-dev/pytest-django/issues/448
- env: TOXENV=pypy3-pytest30-django1.8-sqlite
- env: TOXENV=pypy3-pytest30-django1.10-sqlite_file
- env: TOXENV=pypy3-pytest3-django1.8-sqlite
- env: TOXENV=pypy3-pytest3-django1.10-sqlite_file

cache:
directories:
Expand Down
22 changes: 11 additions & 11 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
[tox]
envlist =
- py{35,36}-pytest30-django{master,1.11,1.10,1.9,1.8}-postgres
- py34-pytest30-django{1.11,1.10}-postgres
- py33-pytest30-django1.8-postgres
- py27-pytest30-django{1.11,1.10}-{mysql_innodb,mysql_myisam,postgres}
- py27-pytest30-django{1.11,1.10,1.9,1.8,1.7}-postgres
- pypy3-pytest30-django1.8-{sqlite,sqlite_file}
- pypy3-pytest29-django1.8-sqlite_file
- pypy-pytest30-django1.10-sqlite_file
- py{35,36}-pytest3-django{master,1.11,1.10,1.9,1.8}-postgres
- py34-pytest3-django{1.11,1.10}-postgres
- py33-pytest3-django1.8-postgres
- py27-pytest3-django{1.11,1.10}-{mysql_innodb,mysql_myisam,postgres}
- py27-pytest3-django{1.11,1.10,1.9,1.8,1.7}-postgres
- pypy3-pytest3-django1.8-{sqlite,sqlite_file}
- pypy3-pytest2-django1.8-sqlite_file
- pypy-pytest3-django1.10-sqlite_file
- py{35,py27}-checkqa

[testenv]
Expand All @@ -18,7 +18,7 @@ deps =
checkqa: flake8

djangomaster: https://github.com/django/django/archive/master.tar.gz
django1.11: Django==1.11b1
django1.11: Django>=1.11,<1.12
django1.10: Django>=1.10,<1.11
django1.9: Django>=1.9,<1.10
django1.8: Django>=1.8,<1.9
Expand All @@ -29,8 +29,8 @@ deps =

postgres: psycopg2

pytest29: pytest>=2.9,<3.0
pytest30: pytest>=3.0,<3.1.11a1
pytest2: pytest>=2.9,<3.0
pytest3: pytest>=3.0,<4.0

setenv =
PYTHONPATH = {toxinidir}:{env:PYTHONPATH:}
Expand Down