Skip to content

Commit 16a0442

Browse files
committed
updates CI config
1 parent 8152303 commit 16a0442

File tree

2 files changed

+8
-24
lines changed

2 files changed

+8
-24
lines changed

.travis.yml

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ python:
44
- 3.5
55
- 3.6
66
- 3.7
7+
- 3.8
78

89
addons:
910
postgresql: "9.4"
@@ -16,39 +17,20 @@ services:
1617
- MySQL
1718
- PostgreSQL
1819

19-
#jobs:
20-
# include:
21-
# - python: 3.7
22-
# env: TRAVIS_PYTHON_VERSION=3.7 DJANGO=2.0 DB=mysql
23-
# sudo: required
24-
# dist: xenial
25-
#
26-
# - python: 3.7
27-
# env: TRAVIS_PYTHON_VERSION=3.7 DJANGO=2.1 DB=pg
28-
# sudo: required
29-
# dist: xenial
30-
#
31-
# - python: 3.7
32-
# env: TRAVIS_PYTHON_VERSION=3.7 DJANGO=2.0 DB=mysql
33-
# sudo: required
34-
# dist: xenial
35-
#
36-
# - python: 3.7
37-
# env: TRAVIS_PYTHON_VERSION=3.7 DJANGO=2.1 DB=pg
38-
# sudo: required
39-
# dist: xenial
40-
4120

4221
env:
4322
- DJANGO=1.11 DB=pg
4423
- DJANGO=2.0 DB=pg
4524
- DJANGO=2.1 DB=pg
4625
- DJANGO=2.2 DB=pg
26+
- DJANGO=2.4 DB=pg
27+
- DJANGO=3.0 DB=pg
4728

4829
- DJANGO=1.11 DB=mysql
4930
- DJANGO=2.0 DB=mysql
5031
- DJANGO=2.1 DB=mysql
5132
- DJANGO=2.2 DB=mysql
33+
- DJANGO=3.0 DB=mysql
5234

5335

5436
install:

tox.ini

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[tox]
22
envlist = d{111}-py{35,36,37,py}-{pg,sqlite,mysql},
3-
d{20,21,22}-py{35,36,37}-{pg,sqlite,mysql}
3+
d{20,21,22,30}-py{35,36,37}-{pg,sqlite,mysql}
4+
d{22,30}-py{36,37,38}-{pg,sqlite,mysql}
45

56

67
[pytest]
@@ -58,7 +59,8 @@ deps=
5859
d111: django>=1.11,<1.12
5960
d20: django>=2.0,<2.1
6061
d21: django>=2.1,<2.2
61-
d22: django>=2.2rc1,<2.3
62+
d22: django>=2.2,<2.3
63+
d30: django>=3.0,<3.1
6264

6365

6466
commands =

0 commit comments

Comments
 (0)