Skip to content

Commit

Permalink
Updated code base run against latest version of Django and Python.
Browse files Browse the repository at this point in the history
  • Loading branch information
charettes committed Aug 11, 2018
1 parent a15cecd commit f0a0b41
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 49 deletions.
76 changes: 40 additions & 36 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,44 +1,48 @@
sudo: no

dist: trusty
sudo: false
language: python

env:
- TOXENV=flake8
- TOXENV=isort
- TOXENV=py27-1.8
- TOXENV=py27-1.9
- TOXENV=py27-1.10
- TOXENV=py27-1.11
- TOXENV=py34-1.8
- TOXENV=py34-1.9
- TOXENV=py34-1.10
- TOXENV=py34-1.11
- TOXENV=py34-master

- TOXENV=flake8
- TOXENV=isort
cache: pip
matrix:
fast_finish: true
include:
- python: 3.5
env: TOXENV=py35-1.9
- python: 3.5
env: TOXENV=py35-1.10
- python: 3.5
env: TOXENV=py35-1.11
- python: 3.5
env: TOXENV=py35-master
- python: 3.6
env: TOXENV=py36-1.11
- python: 3.6
env: TOXENV=py36-master
- python: 2.7
env: TOXENV=py27-1.11
- python: 3.4
env: TOXENV=py34-1.11
- python: 3.4
env: TOXENV=py34-2.0
- python: 3.5
env: TOXENV=py35-1.11
- python: 3.5
env: TOXENV=py35-2.0
- python: 3.5
env: TOXENV=py35-2.1
- python: 3.5
env: TOXENV=py35-master
- python: 3.6
env: TOXENV=py36-1.11
- python: 3.6
env: TOXENV=py36-2.0
- python: 3.6
env: TOXENV=py36-2.1
- python: 3.6
env: TOXENV=py36-master
- python: 3.7
env: TOXENV=py37-2.0
- python: 3.7
env: TOXENV=py37-2.1
- python: 3.7
env: TOXENV=py37-master
allow_failures:
- env: TOXENV=py34-master
- env: TOXENV=py35-master
- env: TOXENV=py36-master

- env: TOXENV=py35-master
- env: TOXENV=py36-master
- env: TOXENV=py37-master
install:
- pip install tox coveralls

- pip install tox coveralls
script:
- tox

- tox
after_success:
- if [ -f .coverage ]; then coveralls; fi
- if [ -f .coverage ]; then coveralls; fi
23 changes: 10 additions & 13 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,28 @@ args_are_paths = false
envlist =
flake8,
isort,
py27-{1.8,1.9,1.10,1.11},
py{32,33}-1.8,
py34-{1.8,1.9,1.10,1.11,master},
py35-{1.9,1.10,1.11,master},
py36-{1.11,master}
py27-1.11,
py34-{1.11,2.0},
py35-{1.11,2.0,2.1,master},
py36-{1.11,2.0,2.1,master},
py37-{2.0,2.1,master}

[testenv]
basepython =
py27: python2.7
py32: python3.2
py33: python3.3
py34: python3.4
py35: python3.5
py36: python3.6
py37: python3.7
usedevelop = true
commands =
{envpython} -R -Wonce {envbindir}/coverage run {envbindir}/django-admin.py test -v2 --settings=tests.settings {posargs}
{envpython} -R -Wonce {envbindir}/coverage run -m django test -v2 --settings=tests.settings {posargs}
coverage report
deps =
py32: coverage<4.0
{py27,py33,py34,py35,py36}: coverage
1.8: Django>=1.8,<1.9
1.9: Django>=1.9,<1.10
1.10: Django>=1.10,<1.11
coverage
1.11: Django>=1.11,<2.0
2.0: Django>=2.0,<2.1
2.1: Django>=2.1,<2.2
master: https://github.com/django/django/archive/master.tar.gz

[testenv:flake8]
Expand Down

0 comments on commit f0a0b41

Please sign in to comment.