Skip to content

Commit e130666

Browse files
authored
support only drf 3.12 (#833)
1 parent d012c02 commit e130666

File tree

6 files changed

+19
-22
lines changed

6 files changed

+19
-22
lines changed

.travis.yml

+7-13
Original file line numberDiff line numberDiff line change
@@ -20,40 +20,34 @@ matrix:
2020
env: TOXENV=docs
2121

2222
- python: 3.5
23-
env: TOXENV=py35-django22-drf310
24-
- python: 3.5
25-
env: TOXENV=py35-django22-drf311
23+
env: TOXENV=py35-django22-drf312
2624
- python: 3.5
2725
env: TOXENV=py35-django22-drfmaster
2826

2927
- python: 3.6
30-
env: TOXENV=py36-django22-drf310
31-
- python: 3.6
32-
env: TOXENV=py36-django22-drf311
28+
env: TOXENV=py36-django22-drf312
3329
- python: 3.6
3430
env: TOXENV=py36-django22-drfmaster
3531
- python: 3.6
36-
env: TOXENV=py36-django30-drf311
32+
env: TOXENV=py36-django30-drf312
3733
- python: 3.6
3834
env: TOXENV=py36-django30-drfmaster
3935

4036
- python: 3.7
41-
env: TOXENV=py37-django22-drf310
42-
- python: 3.7
43-
env: TOXENV=py37-django22-drf311
37+
env: TOXENV=py37-django22-drf312
4438
- python: 3.7
4539
env: TOXENV=py37-django22-drfmaster
4640
- python: 3.7
47-
env: TOXENV=py37-django30-drf311
41+
env: TOXENV=py37-django30-drf312
4842
- python: 3.7
4943
env: TOXENV=py37-django30-drfmaster
5044

5145
- python: 3.8
52-
env: TOXENV=py38-django22-drf311
46+
env: TOXENV=py38-django22-drf312
5347
- python: 3.8
5448
env: TOXENV=py38-django22-drfmaster
5549
- python: 3.8
56-
env: TOXENV=py38-django30-drf311
50+
env: TOXENV=py38-django30-drf312
5751
- python: 3.8
5852
env: TOXENV=py38-django30-drfmaster
5953

CHANGELOG.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,15 @@ any parts of the framework not mentioned in the documentation should generally b
1414

1515
* Removed support for Django 1.11.
1616
* Removed support for Django 2.1.
17+
* Removed support for Django REST framework 3.10, 3.11
18+
19+
### Added
20+
* Added support for Django REST framework 3.12
21+
1722

1823
## [3.2.0] - 2020-08-26
1924

20-
This is the last release supporting Django 1.11 and Django 2.1.
25+
This is the last release supporting Django 1.11, Django 2.1, DRF 3.10 and DRF 3.11.
2126

2227
### Added
2328

README.rst

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

9090
1. Python (3.5, 3.6, 3.7, 3.8)
9191
2. Django (2.2, 3.0)
92-
3. Django REST Framework (3.10, 3.11)
92+
3. Django REST Framework (3.12)
9393

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

docs/getting-started.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ like the following:
5353

5454
1. Python (3.5, 3.6, 3.7, 3.8)
5555
2. Django (2.2, 3.0)
56-
3. Django REST Framework (3.10, 3.11)
56+
3. Django REST Framework (3.12)
5757

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

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ def get_package_data(package):
9090
],
9191
install_requires=[
9292
'inflection>=0.3.0',
93-
'djangorestframework>=3.10,<3.12',
93+
'djangorestframework>=3.12,<3.13',
9494
'django>=2.2,<3.1',
9595
],
9696
extras_require={

tox.ini

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
[tox]
22
envlist =
3-
py{35,36,37}-django22-drf{310,311,master},
4-
py38-django22-drf{311,master},
5-
py{36,37,38}-django30-drf{311,master},
3+
py{35,36,37,38}-django22-drf{312,master},
4+
py{36,37,38}-django30-drf{312,master},
65
lint,docs
76

87
[testenv]
98
deps =
109
django22: Django>=2.2,<2.3
1110
django30: Django>=3.0,<3.1
12-
drf310: djangorestframework>=3.10.2,<3.11
13-
drf311: djangorestframework>=3.11,<3.12
11+
drf312: djangorestframework>=3.12,<3.13
1412
drfmaster: https://github.com/encode/django-rest-framework/archive/master.zip
1513
-rrequirements/requirements-testing.txt
1614
-rrequirements/requirements-optionals.txt

0 commit comments

Comments
 (0)