Skip to content

Commit

Permalink
Merge a3b5e6a into a1ee9a9
Browse files Browse the repository at this point in the history
  • Loading branch information
kjagiello committed Apr 3, 2019
2 parents a1ee9a9 + a3b5e6a commit 153d6c3
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 2 deletions.
24 changes: 24 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,30 @@ env:

matrix:
include:
# Django 2.2 requires SQLite 3.8.3+ which is not available on Ubuntu Trusty
# which is the default Ubuntu version on Travis CI. Run all Django 2.2+
# tests on Ubuntu Xenial instead.
- python: 3.5
env: TOXENV=py35-django22
dist: xenial
- python: 3.6
env: TOXENV=py36-django22
dist: xenial

# Python 3.7 on Travis CI is only available on Ubuntu Xenial.
- python: 3.7
env: TOXENV=py37-django22
dist: xenial
- python: 3.7
env: TOXENV=py37-django111
dist: xenial
- python: 3.7
env: TOXENV=py37-django20
dist: xenial
- python: 3.7
env: TOXENV=py37-django21
dist: xenial

- python: 3.6
env: TOXENV=py36-django111
- python: 3.6
Expand Down
6 changes: 4 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@

[tox]
envlist = py34-django{ 18, 19, 110, 111, 20 },
py35-django{ 18, 19, 110, 111, 20, 21 },
py36-django{ 111, 20, 21 }
py35-django{ 18, 19, 110, 111, 20, 21, 22 },
py36-django{ 111, 20, 21, 22 },
py37-django{ 111, 20, 21, 22 }


[testenv]
Expand All @@ -25,6 +26,7 @@ deps = django18: Django>=1.8,<1.9
django111: Django>=1.11,<1.12
django20: Django>=2.0b1,<2.1
django21: Django>=2.1,<2.2
django22: Django>=2.2,<2.3
coverage
djangorestframework>=3.9.0,<4
django-cors-headers>=2.4.0,<3
Expand Down

0 comments on commit 153d6c3

Please sign in to comment.