Skip to content

Commit ba7f0ea

Browse files
authored
Merge pull request #1214 from jdufresne/py38
Add Python 3.8 to the test matrix
2 parents db90ea7 + 64ceadd commit ba7f0ea

File tree

3 files changed

+20
-13
lines changed

3 files changed

+20
-13
lines changed

.travis.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
1-
dist: xenial
21
language: python
32
cache: pip
43
matrix:
54
fast_finish: true
65
include:
76
- env: TOXENV=flake8
8-
- python: 3.7
9-
env: TOXENV=style
10-
- python: 3.7
11-
env: TOXENV=readme
7+
- env: TOXENV=style
8+
- env: TOXENV=readme
129
- python: 3.5
1310
env: TOXENV=py35-dj111
1411
- python: 3.6
@@ -33,20 +30,24 @@ matrix:
3330
env: TOXENV=py36-dj22
3431
- python: 3.7
3532
env: TOXENV=py37-dj22
33+
- python: 3.8
34+
env: TOXENV=py38-dj22
3635
- python: 3.6
3736
env: TOXENV=py36-dj30
3837
- python: 3.7
3938
env: TOXENV=py37-dj30
39+
- python: 3.8
40+
env: TOXENV=py38-dj30
4041
- python: 3.6
4142
env: TOXENV=py36-djmaster
4243
- python: 3.7
4344
env: TOXENV=py37-djmaster
44-
- python: 3.7
45-
env: TOXENV=postgresql
45+
- python: 3.8
46+
env: TOXENV=py38-djmaster
47+
- env: TOXENV=postgresql
4648
addons:
4749
postgresql: "9.5"
48-
- python: 3.7
49-
env: TOXENV=mariadb
50+
- env: TOXENV=mariadb
5051
addons:
5152
mariadb: "10.3"
5253
script:
@@ -59,6 +60,7 @@ matrix:
5960
allow_failures:
6061
- env: TOXENV=py36-djmaster
6162
- env: TOXENV=py37-djmaster
63+
- env: TOXENV=py38-djmaster
6264

6365
install:
6466
- pip install tox codecov

docs/changes.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
Change log
22
==========
33

4+
UNRELEASED
5+
----------
6+
7+
* Added support for Python 3.8.
8+
49
2.1 (2019-11-12)
510
----------------
611

tox.ini

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ envlist =
66
py{35,36,37}-dj111
77
py{35,36,37}-dj20
88
py{35,36,37}-dj21
9-
py{35,36,37}-dj22
10-
py{36,37}-dj30
11-
py{36,37}-djmaster
9+
py{35,36,37,38}-dj22
10+
py{36,37,38}-dj30
11+
py{36,37,38}-djmaster
1212
postgresql
1313
mariadb
1414

@@ -18,7 +18,7 @@ deps =
1818
dj20: Django==2.0.*
1919
dj21: Django==2.1.*
2020
dj22: Django==2.2.*
21-
dj30: Django>=3.0b1,<3.1
21+
dj30: Django==3.0.*
2222
djmaster: https://github.com/django/django/archive/master.tar.gz
2323
coverage
2424
Jinja2

0 commit comments

Comments
 (0)