Skip to content

Commit 9e4f128

Browse files
committed
travis: Remove django 2.1 from test matrix, add dj22-grp and dj31
1 parent d7926da commit 9e4f128

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

.travis.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@ matrix:
55
- { python: 2.7, env: TOXENV=py27-dj111 }
66
- { python: 2.7, env: TOXENV=py27-dj111-grp }
77
- { python: 3.6, env: TOXENV=py36-dj111 }
8-
- { python: 3.6, env: TOXENV=py36-dj21 }
9-
- { python: 3.6, env: TOXENV=py36-dj21-grp }
108
- { python: 3.6, dist: xenial, env: TOXENV=py36-dj22 }
9+
- { python: 3.6, dist: xenial, env: TOXENV=py36-dj22-grp }
1110
- { python: 3.6, dist: xenial, env: TOXENV=py36-dj30 }
1211
- { python: 3.6, dist: xenial, env: TOXENV=py36-dj30-grp }
12+
- { python: 3.6, dist: xenial, env: TOXENV=py36-dj31 }
13+
allow_failures:
14+
- env: TOXENV=py36-dj31
1315

1416
cache:
1517
pip: true

CHANGELOG.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ Changelog
66
* Fixed: Resolved sporadic MediaOrderConflictWarning issues on Django 2.2
77
Fixes `#141`_.
88
* Fixed: Improved media dependency ordering of widgets and nested_admin.js
9+
* Fixed: Provisional support for Django 3.1 alpha
10+
* Dropped support for Django 2.1 (official EOL December 2019)
911

1012
.. _#141: https://github.com/theatlantic/django-nested-admin/issues/141
1113

tox.ini

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
envlist =
33
py{27,36}-dj111{,-grp}
44
py36-dj{22,30}{,-grp}
5+
py36-dj31
56
skipsdist=True
67

78
[testenv]
@@ -18,7 +19,7 @@ passenv =
1819
AWS_SECRET_ACCESS_KEY
1920
DATABASE_URL
2021
deps =
21-
selenium==3.141.0
22+
selenium
2223
coverage
2324
django-selenosis
2425
dj-database-url
@@ -32,6 +33,7 @@ deps =
3233
dj21: Django>=2.1.0,<2.1.99
3334
dj22: Django>=2.2a1,<2.2.99
3435
dj30: Django>=3.0,<3.1
36+
dj31: Django>=3.1a0,<3.2
3537
dj111-grp: django-grappelli==2.10.4
3638
dj22-grp: django-grappelli==2.13.4
3739
dj30-grp: django-grappelli==2.14.2

0 commit comments

Comments
 (0)