Skip to content

Commit

Permalink
Django version Dance: support 1.11
Browse files Browse the repository at this point in the history
  • Loading branch information
jpic committed Apr 5, 2017
1 parent 685663c commit c24d27d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
11 changes: 7 additions & 4 deletions .travis.yml
Expand Up @@ -10,12 +10,15 @@ env:
matrix:
- TOXENV=checkqa
- TOXENV=docs
- TOXENV=base-py27-django18-sqlite
- TOXENV=base-py27-django110-sqlite
- TOXENV=base-pypy-django18-sqlite
- TOXENV=base-pypy-django110-sqlite
- TOXENV=base-py27-django111-sqlite
- TOXENV=base-pypy-django111-sqlite
- TOXENV=base-py34-django111-sqlite
- TOXENV=base-py34-django18-sqlite
- TOXENV=base-py34-django110-sqlite
- TOXENV=base-py34-djangomaster-sqlite
matrix:
allow_failures:
- env: TOXENV=base-py34-djangomaster-sqlite
install:
- travis_retry pip install -U pip
- travis_retry pip install tox
Expand Down
5 changes: 3 additions & 2 deletions tox.ini
@@ -1,7 +1,7 @@
[tox]
# Note that django doesn't support pypy3 for now
# https://code.djangoproject.com/ticket/25849
envlist = base-py{27,34,35,py,py3}-django{18,19,110,master}-{sqlite,mysql,postgresql}
envlist = base-py{27,34,35,py,py3}-django{18,19,110,111,master}-{sqlite,mysql,postgresql}

[testenv]
changedir = {toxinidir}/test_project
Expand All @@ -22,7 +22,8 @@ commands =
deps =
django18: Django>=1.8,<1.9
django19: Django>=1.9,<1.10
django110: Django>=1.10a
django110: Django>=1.10a,<1.11
django111: Django>=1.11a
djangomaster: https://github.com/django/django/archive/master.tar.gz
postgresql: psycopg2
mysql: mysql-python
Expand Down

0 comments on commit c24d27d

Please sign in to comment.