Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 11 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
dist: xenial
language: python
cache: pip
matrix:
fast_finish: true
include:
- env: TOXENV=flake8
- python: 3.7
env: TOXENV=style
- python: 3.7
env: TOXENV=readme
- env: TOXENV=style
- env: TOXENV=readme
- python: 3.5
env: TOXENV=py35-dj111
- python: 3.6
Expand All @@ -33,20 +30,24 @@ matrix:
env: TOXENV=py36-dj22
- python: 3.7
env: TOXENV=py37-dj22
- python: 3.8
env: TOXENV=py38-dj22
- python: 3.6
env: TOXENV=py36-dj30
- python: 3.7
env: TOXENV=py37-dj30
- python: 3.8
env: TOXENV=py38-dj30
- python: 3.6
env: TOXENV=py36-djmaster
- python: 3.7
env: TOXENV=py37-djmaster
- python: 3.7
env: TOXENV=postgresql
- python: 3.8
env: TOXENV=py38-djmaster
- env: TOXENV=postgresql
addons:
postgresql: "9.5"
- python: 3.7
env: TOXENV=mariadb
- env: TOXENV=mariadb
addons:
mariadb: "10.3"
script:
Expand All @@ -59,6 +60,7 @@ matrix:
allow_failures:
- env: TOXENV=py36-djmaster
- env: TOXENV=py37-djmaster
- env: TOXENV=py38-djmaster

install:
- pip install tox codecov
Expand Down
5 changes: 5 additions & 0 deletions docs/changes.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
Change log
==========

UNRELEASED
----------

* Added support for Python 3.8.

2.1 (2019-11-12)
----------------

Expand Down
8 changes: 4 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ envlist =
py{35,36,37}-dj111
py{35,36,37}-dj20
py{35,36,37}-dj21
py{35,36,37}-dj22
py{36,37}-dj30
py{36,37}-djmaster
py{35,36,37,38}-dj22
py{36,37,38}-dj30
py{36,37,38}-djmaster
postgresql
mariadb

Expand All @@ -18,7 +18,7 @@ deps =
dj20: Django==2.0.*
dj21: Django==2.1.*
dj22: Django==2.2.*
dj30: Django>=3.0b1,<3.1
dj30: Django==3.0.*
djmaster: https://github.com/django/django/archive/master.tar.gz
coverage
Jinja2
Expand Down