Merge pull request #27 from anexia-it/django41

Update readme, compatibility matrix, prepare new release
anexia · Sep 14, 2022 · 5aac628 · 5aac628
2 parents d58bd15 + 91173a9
commit 5aac628
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 22 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -8,37 +8,32 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-          - "3.6"
           - "3.7"
           - "3.8"
           - "3.9"
           - "3.10"
-          - "pypy3"
         django-version:
-          - "2.2"
           - "3.2"
+          - "4.0"
+          - "4.1"
         drf-version:
-          - "3.9"
-          - "3.10"
-          - "3.11"
           - "3.12"
+          - "3.13"
         exclude:
-          # DRF 3.9 imports python_2_unicode_compatible from django.utils.encoding
-          # which has been moved to six.python_2_unicode_compatible()
-          - django-version: "3.2"
-            drf-version: "3.9"
-          # DRF 3.10 imports FieldDoesNotExist from django.db.models,
-          # which has been moved to django.core.exceptions as of Django 3.1
-          - django-version: "3.2"
-            drf-version: "3.10"
-          # DRF "3.12" still causes TokenProxy TypeErrors
+          - python-version: "3.7"
+            django-version: "4.0"
+          - python-version: "3.7"
+            django-version: "4.1"
+          - drf-version: "3.12"
+            django-version: "4.0"
           - drf-version: "3.12"
+            django-version: "4.1"
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ## [Unreleased]
 
+- Added setting for disabling superuser login
+- Added Django 4.0 support
+- Added Django 4.1 support
+- Removed Django 2.2 support
+- Removed Python 3.6 support
+
 ## [1.4.0]
 
 - Added Django 3.2 support

diff --git a/README.md b/README.md
@@ -93,9 +93,10 @@ If your project uses an older verison of Django or Django Rest Framework, you ca
 
 | This Project | Python Version | Django Version | Django Rest Framework |
 |--------------|----------------|----------------|-----------------------|
-| 1.4.*        | 3.6+           | 2.2+, 3.2+     | 3.9, 3.10, 3.11, 3.12 |
-| 1.3.*        | 2.7, 3.4+      | 1.11, 2.0+     | 3.6, 3.7, 3.8         |
-| 1.2.*        | 2.7, 3.4+      | 1.8, 1.11, 2.0+| 3.6, 3.7, 3.8         |
+| 1.5.*        | 3.7+           | 3.2, 4.0, 4.1  | 3.12, 3.13            |
+| 1.4.*        | 3.6+           | 2.2, 3.2       | 3.9, 3.10, 3.11, 3.12 |
+| 1.3.*        | 2.7, 3.4+      | 1.11, 2.0      | 3.6, 3.7, 3.8         |
+| 1.2.*        | 2.7, 3.4+      | 1.8, 1.11, 2.0 | 3.6, 3.7, 3.8         |
 
 Make sure to use at least `DRF 3.10` when using `Django 3.0` or newer.
 

diff --git a/setup.py b/setup.py
@@ -26,14 +26,14 @@
         'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',
         'Framework :: Django',
-        'Framework :: Django :: 2.2',
         'Framework :: Django :: 3.2',
+        'Framework :: Django :: 4.0',
+        'Framework :: Django :: 4.1',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',