Skip to content

Commit

Permalink
Make the Travis CI matrix explicit, add newer Python and Django versions
Browse files Browse the repository at this point in the history
  • Loading branch information
matthiask committed Jan 22, 2020
1 parent 8e0b04f commit 21ab8ca
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 18 deletions.
59 changes: 42 additions & 17 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,50 @@
language: python
dist: xenial
sudo: false
language: python
cache: pip
python:
- "3.6"
- "3.5"
env:
- REQ='Django>=2.1,<2.2'
- REQ='Django>=2.0,<2.1'
- 3.7
services:
- postgresql
# Matrix composition:
# Django LTS versions: All supported Python releases
# Other versions and master branch: The newest possible Python release
matrix:
install:
- pip install -U pip setuptools wheel
- pip install $REQ
- python setup.py install
script: cd tests && ./manage.py test -v 2 testapp && cd ..

jobs:
fast_finish: true
include:
- stage: style
env: REQ=none
install: skip
script:
- python: 3.7
env: REQ="https://github.com/django/django/archive/master.zip#egg=Django"
- python: 3.7
env: REQ="Django>=3.0,<3.1"
- python: 3.6
env: REQ="Django>=3.0,<3.1"
- python: 3.7
env: REQ="Django>=2.2,<3.0"
- python: 3.6
env: REQ="Django>=2.2,<3.0"
- python: 3.5
env: REQ="Django>=2.2,<3.0"
- python: 3.7
env: REQ="Django>=2.1,<2.2"
- python: 3.7
env: REQ="Django>=2.0,<2.1"
- python: 3.7
env: REQ="Django>=1.11,<2.0"
- python: 3.6
env: REQ="Django>=1.11,<2.0"
- python: 3.5
env: REQ="Django>=1.11,<2.0"
- python: 3.7
env: REQ="black flake8"
install:
- pip install black flake8
script:
- flake8 .
- black --check spark tests
allow_failures:
- env: REQ="https://github.com/django/django/archive/master.zip#egg=Django"
install:
- pip install -U pip setuptools wheel
- pip install $REQ
- python setup.py install
script: cd tests && ./manage.py test -v 2 testapp && cd ..
2 changes: 2 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ Change log
``spark_mails`` API and made mail sending not fail silently by
default.
- Fixed a bug where an empty template would crash the mail rendering.
- Rewrote the Travis CI configuration to make jobs explicit, added newer
Django and Python versions to the matrix.


`0.3`_ (2018-10-29)
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ changedir = {toxinidir}
skip_install = true
commands =
coverage run tests/manage.py test -v 2 {posargs:testapp}
coverage html
coverage report -m

0 comments on commit 21ab8ca

Please sign in to comment.