From 5e91279469a54613bb73eb94373b7fd7d3e12a11 Mon Sep 17 00:00:00 2001
From: Oliver Sauder <os@esite.ch>
Date: Mon, 21 Sep 2020 17:24:54 +0200
Subject: [PATCH] Drop support for Django 1.11 and 2.1
---
.travis.yml | 35 -----------------------------------
CHANGELOG.md | 9 +++++++++
README.rst | 2 +-
docs/getting-started.md | 2 +-
setup.py | 2 +-
tox.ini | 7 ++-----
6 files changed, 14 insertions(+), 43 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 301ed0cc..ad495df9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,11 +5,6 @@ cache: pip
# Favor explicit over implicit and use an explicit build matrix.
matrix:
allow_failures:
- - env: TOXENV=py35-django111-drfmaster
- - env: TOXENV=py36-django111-drfmaster
- - env: TOXENV=py35-django21-drfmaster
- - env: TOXENV=py36-django21-drfmaster
- - env: TOXENV=py37-django21-drfmaster
- env: TOXENV=py35-django22-drfmaster
- env: TOXENV=py36-django22-drfmaster
- env: TOXENV=py37-django22-drfmaster
@@ -24,18 +19,6 @@ matrix:
- python: 3.6
env: TOXENV=docs
- - python: 3.5
- env: TOXENV=py35-django111-drf310
- - python: 3.5
- env: TOXENV=py35-django111-drf311
- - python: 3.5
- env: TOXENV=py35-django111-drfmaster
- - python: 3.5
- env: TOXENV=py35-django21-drf310
- - python: 3.5
- env: TOXENV=py35-django21-drf311
- - python: 3.5
- env: TOXENV=py35-django21-drfmaster
- python: 3.5
env: TOXENV=py35-django22-drf310
- python: 3.5
@@ -43,18 +26,6 @@ matrix:
- python: 3.5
env: TOXENV=py35-django22-drfmaster
- - python: 3.6
- env: TOXENV=py36-django111-drf310
- - python: 3.6
- env: TOXENV=py36-django111-drf311
- - python: 3.6
- env: TOXENV=py36-django111-drfmaster
- - python: 3.6
- env: TOXENV=py36-django21-drf310
- - python: 3.6
- env: TOXENV=py36-django21-drf311
- - python: 3.6
- env: TOXENV=py36-django21-drfmaster
- python: 3.6
env: TOXENV=py36-django22-drf310
- python: 3.6
@@ -66,12 +37,6 @@ matrix:
- python: 3.6
env: TOXENV=py36-django30-drfmaster
- - python: 3.7
- env: TOXENV=py37-django21-drf310
- - python: 3.7
- env: TOXENV=py37-django21-drf311
- - python: 3.7
- env: TOXENV=py37-django21-drfmaster
- python: 3.7
env: TOXENV=py37-django22-drf310
- python: 3.7
diff --git a/CHANGELOG.md b/CHANGELOG.md
index dcd05605..f4b110ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,8 +8,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
Note that in line with [Django REST Framework policy](http://www.django-rest-framework.org/topics/release-notes/),
any parts of the framework not mentioned in the documentation should generally be considered private API, and may be subject to change.
+## [Unreleased]
+
+### Removed
+
+* Removed support for Django 1.11.
+* Removed support for Django 2.1.
+
## [3.2.0] - 2020-08-26
+This is the last release supporting Django 1.11 and Django 2.1.
+
### Added
* Added support for serializing nested serializers as attribute json value introducing setting `JSON_API_SERIALIZE_NESTED_SERIALIZERS_AS_ATTRIBUTE`
diff --git a/README.rst b/README.rst
index bc52bbf5..07f18a8d 100644
--- a/README.rst
+++ b/README.rst
@@ -88,7 +88,7 @@ Requirements
------------
1. Python (3.5, 3.6, 3.7, 3.8)
-2. Django (1.11, 2.1, 2.2, 3.0)
+2. Django (2.2, 3.0)
3. Django REST Framework (3.10, 3.11)
We **highly** recommend and only officially support the latest patch release of each Python, Django and REST Framework series.
diff --git a/docs/getting-started.md b/docs/getting-started.md
index 58768e39..39ef6a88 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -52,7 +52,7 @@ like the following:
## Requirements
1. Python (3.5, 3.6, 3.7, 3.8)
-2. Django (1.11, 2.1, 2.2, 3.0)
+2. Django (2.2, 3.0)
3. Django REST Framework (3.10, 3.11)
We **highly** recommend and only officially support the latest patch release of each Python, Django and REST Framework series.
diff --git a/setup.py b/setup.py
index d37c66f3..42d7d8c4 100755
--- a/setup.py
+++ b/setup.py
@@ -91,7 +91,7 @@ def get_package_data(package):
install_requires=[
'inflection>=0.3.0',
'djangorestframework>=3.10,<3.12',
- 'django>=1.11,<3.1',
+ 'django>=2.2,<3.1',
],
extras_require={
'django-polymorphic': ['django-polymorphic>=2.0'],
diff --git a/tox.ini b/tox.ini
index 04b970ac..58956ee5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,15 +1,12 @@
[tox]
envlist =
- py{35,36}-django{111}-drf{310,311,master},
- py{35,36,37}-django{21,22}-drf{310,311,master},
+ py{35,36,37}-django22-drf{310,311,master},
py38-django22-drf{311,master},
- py{36,37,38}-django{30}-drf{311,master},
+ py{36,37,38}-django30-drf{311,master},
lint,docs
[testenv]
deps =
- django111: Django>=1.11,<1.12
- django21: Django>=2.1,<2.2
django22: Django>=2.2,<2.3
django30: Django>=3.0,<3.1
drf310: djangorestframework>=3.10.2,<3.11