Skip to content

Commit 7b2a4ff

Browse files
authored
Drop support for Django 1.11 and 2.1 (#831)
1 parent 82daf66 commit 7b2a4ff

File tree

6 files changed

+14
-43
lines changed

6 files changed

+14
-43
lines changed

.travis.yml

-35
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@ cache: pip
55
# Favor explicit over implicit and use an explicit build matrix.
66
matrix:
77
allow_failures:
8-
- env: TOXENV=py35-django111-drfmaster
9-
- env: TOXENV=py36-django111-drfmaster
10-
- env: TOXENV=py35-django21-drfmaster
11-
- env: TOXENV=py36-django21-drfmaster
12-
- env: TOXENV=py37-django21-drfmaster
138
- env: TOXENV=py35-django22-drfmaster
149
- env: TOXENV=py36-django22-drfmaster
1510
- env: TOXENV=py37-django22-drfmaster
@@ -24,37 +19,13 @@ matrix:
2419
- python: 3.6
2520
env: TOXENV=docs
2621

27-
- python: 3.5
28-
env: TOXENV=py35-django111-drf310
29-
- python: 3.5
30-
env: TOXENV=py35-django111-drf311
31-
- python: 3.5
32-
env: TOXENV=py35-django111-drfmaster
33-
- python: 3.5
34-
env: TOXENV=py35-django21-drf310
35-
- python: 3.5
36-
env: TOXENV=py35-django21-drf311
37-
- python: 3.5
38-
env: TOXENV=py35-django21-drfmaster
3922
- python: 3.5
4023
env: TOXENV=py35-django22-drf310
4124
- python: 3.5
4225
env: TOXENV=py35-django22-drf311
4326
- python: 3.5
4427
env: TOXENV=py35-django22-drfmaster
4528

46-
- python: 3.6
47-
env: TOXENV=py36-django111-drf310
48-
- python: 3.6
49-
env: TOXENV=py36-django111-drf311
50-
- python: 3.6
51-
env: TOXENV=py36-django111-drfmaster
52-
- python: 3.6
53-
env: TOXENV=py36-django21-drf310
54-
- python: 3.6
55-
env: TOXENV=py36-django21-drf311
56-
- python: 3.6
57-
env: TOXENV=py36-django21-drfmaster
5829
- python: 3.6
5930
env: TOXENV=py36-django22-drf310
6031
- python: 3.6
@@ -66,12 +37,6 @@ matrix:
6637
- python: 3.6
6738
env: TOXENV=py36-django30-drfmaster
6839

69-
- python: 3.7
70-
env: TOXENV=py37-django21-drf310
71-
- python: 3.7
72-
env: TOXENV=py37-django21-drf311
73-
- python: 3.7
74-
env: TOXENV=py37-django21-drfmaster
7540
- python: 3.7
7641
env: TOXENV=py37-django22-drf310
7742
- python: 3.7

CHANGELOG.md

+9
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
88
Note that in line with [Django REST Framework policy](http://www.django-rest-framework.org/topics/release-notes/),
99
any parts of the framework not mentioned in the documentation should generally be considered private API, and may be subject to change.
1010

11+
## [Unreleased]
12+
13+
### Removed
14+
15+
* Removed support for Django 1.11.
16+
* Removed support for Django 2.1.
17+
1118
## [3.2.0] - 2020-08-26
1219

20+
This is the last release supporting Django 1.11 and Django 2.1.
21+
1322
### Added
1423

1524
* Added support for serializing nested serializers as attribute json value introducing setting `JSON_API_SERIALIZE_NESTED_SERIALIZERS_AS_ATTRIBUTE`

README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Requirements
8888
------------
8989

9090
1. Python (3.5, 3.6, 3.7, 3.8)
91-
2. Django (1.11, 2.1, 2.2, 3.0)
91+
2. Django (2.2, 3.0)
9292
3. Django REST Framework (3.10, 3.11)
9393

9494
We **highly** recommend and only officially support the latest patch release of each Python, Django and REST Framework series.

docs/getting-started.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ like the following:
5252
## Requirements
5353

5454
1. Python (3.5, 3.6, 3.7, 3.8)
55-
2. Django (1.11, 2.1, 2.2, 3.0)
55+
2. Django (2.2, 3.0)
5656
3. Django REST Framework (3.10, 3.11)
5757

5858
We **highly** recommend and only officially support the latest patch release of each Python, Django and REST Framework series.

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ def get_package_data(package):
9191
install_requires=[
9292
'inflection>=0.3.0',
9393
'djangorestframework>=3.10,<3.12',
94-
'django>=1.11,<3.1',
94+
'django>=2.2,<3.1',
9595
],
9696
extras_require={
9797
'django-polymorphic': ['django-polymorphic>=2.0'],

tox.ini

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
[tox]
22
envlist =
3-
py{35,36}-django{111}-drf{310,311,master},
4-
py{35,36,37}-django{21,22}-drf{310,311,master},
3+
py{35,36,37}-django22-drf{310,311,master},
54
py38-django22-drf{311,master},
6-
py{36,37,38}-django{30}-drf{311,master},
5+
py{36,37,38}-django30-drf{311,master},
76
lint,docs
87

98
[testenv]
109
deps =
11-
django111: Django>=1.11,<1.12
12-
django21: Django>=2.1,<2.2
1310
django22: Django>=2.2,<2.3
1411
django30: Django>=3.0,<3.1
1512
drf310: djangorestframework>=3.10.2,<3.11

0 commit comments

Comments
 (0)