Skip to content

Commit bcedeb6

Browse files
authored
Merge pull request #1215 from jdufresne/eol-djangos
Remove end of life Djangos from the test matrix
2 parents ba7f0ea + 87ae146 commit bcedeb6

File tree

4 files changed

+3
-20
lines changed

4 files changed

+3
-20
lines changed

.travis.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,6 @@ matrix:
1212
env: TOXENV=py36-dj111
1313
- python: 3.7
1414
env: TOXENV=py37-dj111
15-
- python: 3.5
16-
env: TOXENV=py35-dj20
17-
- python: 3.6
18-
env: TOXENV=py36-dj20
19-
- python: 3.7
20-
env: TOXENV=py37-dj20
21-
- python: 3.5
22-
env: TOXENV=py35-dj21
23-
- python: 3.6
24-
env: TOXENV=py36-dj21
25-
- python: 3.7
26-
env: TOXENV=py37-dj21
2715
- python: 3.5
2816
env: TOXENV=py35-dj22
2917
- python: 3.6

docs/changes.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Change log
44
UNRELEASED
55
----------
66

7+
* Removed support for end of life Django 2.0 and 2.1.
78
* Added support for Python 3.8.
89

910
2.1 (2019-11-12)

setup.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ def readall(path):
3131
"Environment :: Web Environment",
3232
"Framework :: Django",
3333
"Framework :: Django :: 1.11",
34-
"Framework :: Django :: 2.0",
35-
"Framework :: Django :: 2.1",
3634
"Framework :: Django :: 2.2",
3735
"Framework :: Django :: 3.0",
3836
"Intended Audience :: Developers",

tox.ini

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ envlist =
44
style
55
readme
66
py{35,36,37}-dj111
7-
py{35,36,37}-dj20
8-
py{35,36,37}-dj21
97
py{35,36,37,38}-dj22
108
py{36,37,38}-dj30
119
py{36,37,38}-djmaster
@@ -15,8 +13,6 @@ envlist =
1513
[testenv]
1614
deps =
1715
dj111: Django==1.11.*
18-
dj20: Django==2.0.*
19-
dj21: Django==2.1.*
2016
dj22: Django==2.2.*
2117
dj30: Django==3.0.*
2218
djmaster: https://github.com/django/django/archive/master.tar.gz
@@ -33,7 +29,7 @@ commands = make coverage TEST_ARGS='{posargs:tests}'
3329

3430
[testenv:postgresql]
3531
deps =
36-
Django==2.1.*
32+
Django==1.11.*
3733
coverage
3834
Jinja2
3935
html5lib
@@ -49,7 +45,7 @@ commands = make coverage TEST_ARGS='{posargs:tests}'
4945

5046
[testenv:mariadb]
5147
deps =
52-
Django==2.1.*
48+
Django==2.2.*
5349
coverage
5450
Jinja2
5551
html5lib

0 commit comments

Comments
 (0)