Skip to content

Commit cf7ef7b

Browse files
authored
Add support for Django 2.2, dropping 2.0 (#941)
* Add support for Django 2.2, dropping 2.0 * Fix build matrix for Python 2.7/3.4
1 parent 553d1dd commit cf7ef7b

File tree

2 files changed

+16
-17
lines changed

2 files changed

+16
-17
lines changed

.travis.yml

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,36 @@
11
language: python
2-
sudo: false
32
install:
43
- pip install tox
54
script:
65
- tox
7-
env:
8-
- TOXENV=py27-1.11.X
9-
- TOXENV=py34-1.11.X
10-
- TOXENV=py34-2.0.X
11-
# for python 3.5 and 3.6, see https://github.com/travis-ci/travis-ci/issues/4794
12-
# for python 3.7, see https://github.com/travis-ci/travis-ci/issues/9815
136
matrix:
147
include:
8+
- python: 2.7
9+
env: TOXENV=py27-1.11.X
10+
- python: 3.4
11+
env: TOXENV=py34-1.11.X
1512
- python: 3.5
1613
env: TOXENV=py35-1.11.X
1714
- python: 3.6
1815
env: TOXENV=py36-1.11.X
19-
- python: 3.5
20-
env: TOXENV=py35-2.0.X
21-
- python: 3.6
22-
env: TOXENV=py36-2.0.X
2316
- python: 3.7
24-
env: TOXENV=py37-2.0.X
17+
env: TOXENV=py37-1.11.X
2518
dist: xenial
26-
sudo: true
2719
- python: 3.5
2820
env: TOXENV=py35-2.1.X
2921
- python: 3.6
3022
env: TOXENV=py36-2.1.X
3123
- python: 3.7
3224
env: TOXENV=py37-2.1.X
3325
dist: xenial
34-
sudo: true
26+
- python: 3.5
27+
env: TOXENV=py35-2.2.X
28+
- python: 3.6
29+
env: TOXENV=py36-2.2.X
30+
- python: 3.7
31+
env: TOXENV=py37-2.2.X
32+
dist: xenial
33+
3534
notifications:
3635
irc: "irc.freenode.org#django-compressor"
3736
after_success:

tox.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[tox]
22
envlist =
3-
{py27,py34,py35}-1.11.X
4-
{py34,py35,py36,py37}-2.0.X
3+
{py27,py34,py35,py36,py37}-1.11.X
54
{py35,py36,py37}-2.1.X
5+
{py35,py36,py37}-2.2.X
66
[testenv]
77
basepython =
88
py27: python2.7
@@ -19,7 +19,7 @@ commands =
1919
make test
2020
deps =
2121
1.11.X: Django>=1.11,<2.0
22-
2.0.X: Django>=2.0,<2.1
2322
2.1.X: Django>=2.1,<2.2
23+
2.2.X: Django>=2.2,<2.3
2424
-r{toxinidir}/requirements/tests.txt
2525
django-discover-runner

0 commit comments

Comments
 (0)