Skip to content

Commit

Permalink
Add Django 2.1 and Python 3.7 to the build matrix
Browse files Browse the repository at this point in the history
  • Loading branch information
karyon committed Oct 21, 2018
1 parent 869c8a8 commit 2def31d
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 5 deletions.
15 changes: 14 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ env:
- TOXENV=py27-1.11.X
- TOXENV=py34-1.11.X
- TOXENV=py34-2.0.X
# https://github.com/travis-ci/travis-ci/issues/4794
# for python 3.5 and 3.6, see https://github.com/travis-ci/travis-ci/issues/4794
# for python 3.7, see https://github.com/travis-ci/travis-ci/issues/9815
matrix:
include:
- python: 3.5
Expand All @@ -19,6 +20,18 @@ matrix:
env: TOXENV=py35-2.0.X
- python: 3.6
env: TOXENV=py36-2.0.X
- python: 3.7
env: TOXENV=py37-2.0.X
dist: xenial
sudo: true
- python: 3.5
env: TOXENV=py35-2.1.X
- python: 3.6
env: TOXENV=py36-2.1.X
- python: 3.7
env: TOXENV=py37-2.1.X
dist: xenial
sudo: true
notifications:
irc: "irc.freenode.org#django-compressor"
after_success:
Expand Down
3 changes: 2 additions & 1 deletion docs/changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ Unreleased
-------------------

- Drop support for Django 1.8, 1.9 and 1.10
- Add Django 2.0 compatibility
- Add Django 2.0, Django 2.1, and Python 3.7 support
- Update all dependencies. This required minor code changes, you might need to update some optional dependencies if you use any
- Allow the mixed use of JS/CSS in Sekizai's templatetags `{% addtoblock "js" %}` and `{% addtoblock "css" %}`.

v2.2 (2017-08-16)
Expand Down
8 changes: 5 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
[tox]
envlist =
{py27,py34,py35}-{1.11.X}
{py34,py35}-2.0.X
{py36}-{1.11.X,2.0.X}
{py27,py34,py35}-1.11.X
{py34,py35,py36,py37}-2.0.X
{py35,py36,py37}-2.1.X
[testenv]
basepython =
py27: python2.7
py34: python3.4
py35: python3.5
py36: python3.6
py37: python3.7
usedevelop = true
setenv =
CPPFLAGS=-O0
Expand All @@ -19,5 +20,6 @@ commands =
deps =
1.11.X: Django>=1.11,<2.0
2.0.X: Django>=2.0,<2.1
2.1.X: Django>=2.1,<2.2
-r{toxinidir}/requirements/tests.txt
django-discover-runner

0 comments on commit 2def31d

Please sign in to comment.