From ea0f816c23183bfe9d24f15bc54459f6eebc7f02 Mon Sep 17 00:00:00 2001 From: Jeppe Fihl-Pearson Date: Tue, 4 Apr 2023 14:36:01 +0100 Subject: [PATCH 1/3] Add support for Django 4.2 --- CHANGELOG.md | 1 + README.rst | 2 +- docs/getting-started.md | 2 +- setup.py | 2 +- tox.ini | 6 +++--- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f9c175e..e7243f3f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ any parts of the framework not mentioned in the documentation should generally b ### Added * Added support for Python 3.11. +* Added support for Django 4.2. ### Changed diff --git a/README.rst b/README.rst index acc50976..82c2b08f 100644 --- a/README.rst +++ b/README.rst @@ -93,7 +93,7 @@ Requirements ------------ 1. Python (3.7, 3.8, 3.9, 3.10, 3.11) -2. Django (3.2, 4.0, 4.1) +2. Django (3.2, 4.0, 4.1, 4.2) 3. Django REST framework (3.13, 3.14) 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 b73af5ea..07798fae 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -52,7 +52,7 @@ like the following: ## Requirements 1. Python (3.7, 3.8, 3.9, 3.10, 3.11) -2. Django (3.2, 4.0, 4.1) +2. Django (3.2, 4.0, 4.1, 4.2) 3. Django REST framework (3.13, 3.14) 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 3c60bba2..6ebee0d5 100755 --- a/setup.py +++ b/setup.py @@ -98,7 +98,7 @@ def get_package_data(package): install_requires=[ "inflection>=0.5.0", "djangorestframework>=3.13,<3.15", - "django>=3.2,<4.2", + "django>=3.2,<4.3", ], extras_require={ "django-polymorphic": ["django-polymorphic>=3.0"], diff --git a/tox.ini b/tox.ini index 0879e756..f216bf97 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,7 @@ envlist = py{37,38,39,310}-django32-drf{313,314,master}, py{38,39,310}-django40-drf{313,314,master}, - py{38,39,310,311}-django41-drf{314,master}, + py{38,39,310,311}-django42-drf{314,master}, black, docs, lint @@ -11,7 +11,7 @@ envlist = deps = django32: Django>=3.2,<3.3 django40: Django>=4.0,<4.1 - django41: Django>=4.1,<4.2 + django42: Django>=4.2,<4.3 drf313: djangorestframework>=3.13,<3.14 drf314: djangorestframework>=3.14,<3.15 drfmaster: https://github.com/encode/django-rest-framework/archive/master.zip @@ -54,5 +54,5 @@ ignore_outcome = true [testenv:py{38,39,310}-django40-drfmaster] ignore_outcome = true -[testenv:py{38,39,310,311}-django41-drfmaster] +[testenv:py{38,39,310,311}-django42-drfmaster] ignore_outcome = true From 51a09b529221fa7d7bb1fa14997004b4c0b75ab4 Mon Sep 17 00:00:00 2001 From: Jeppe Fihl-Pearson Date: Tue, 4 Apr 2023 14:36:09 +0100 Subject: [PATCH 2/3] Don't use deprecated password hashing implementation The tests run pretty quickly regardless, so it should be okay to use the default password hasher. --- example/settings/dev.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/example/settings/dev.py b/example/settings/dev.py index c5405338..7b40e61f 100644 --- a/example/settings/dev.py +++ b/example/settings/dev.py @@ -60,8 +60,6 @@ SECRET_KEY = "abc123" -PASSWORD_HASHERS = ("django.contrib.auth.hashers.UnsaltedMD5PasswordHasher",) - INTERNAL_IPS = ("127.0.0.1",) JSON_API_FORMAT_FIELD_NAMES = "camelize" From 02d998697f1310c53fe8877eda9d231c10453e07 Mon Sep 17 00:00:00 2001 From: Jeppe Fihl-Pearson Date: Tue, 4 Apr 2023 15:11:14 +0100 Subject: [PATCH 3/3] Reinstate tests for Django 4.1 --- tox.ini | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tox.ini b/tox.ini index f216bf97..ede6f27f 100644 --- a/tox.ini +++ b/tox.ini @@ -2,6 +2,7 @@ envlist = py{37,38,39,310}-django32-drf{313,314,master}, py{38,39,310}-django40-drf{313,314,master}, + py{38,39,310,311}-django41-drf{314,master}, py{38,39,310,311}-django42-drf{314,master}, black, docs, @@ -11,6 +12,7 @@ envlist = deps = django32: Django>=3.2,<3.3 django40: Django>=4.0,<4.1 + django41: Django>=4.1,<4.2 django42: Django>=4.2,<4.3 drf313: djangorestframework>=3.13,<3.14 drf314: djangorestframework>=3.14,<3.15 @@ -54,5 +56,8 @@ ignore_outcome = true [testenv:py{38,39,310}-django40-drfmaster] ignore_outcome = true +[testenv:py{38,39,310,311}-django41-drfmaster] +ignore_outcome = true + [testenv:py{38,39,310,311}-django42-drfmaster] ignore_outcome = true