Merge pull request #129 from jazzband/dj42

closes #116: Add support for Django 4.2
jazzband · Jul 22, 2024 · 453f099 · 453f099
2 parents edba79c + 4c65ee0
commit 453f099
Show file tree

Hide file tree

Showing 34 changed files with 6,438 additions and 56 deletions.
diff --git a/.github/workflows/test-examples-proj1.yml b/.github/workflows/test-examples-proj1.yml
@@ -11,7 +11,7 @@ jobs:
       max-parallel: 5
       matrix:
         python-version: ['3.10']
-        django-version: ['3.2', '4.0']
+        django-version: ['3.2', '4.0', '4.2']
         include:
           - django-version: 'main'
             python-version: '3.10'

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -11,7 +11,7 @@ jobs:
       max-parallel: 5
       matrix:
         python-version: ['3.8', '3.9', '3.10']
-        django-version: ['3.2', '4.0']
+        django-version: ['3.2', '4.0', '4.2']
         include:
           - django-version: 'main'
             python-version: '3.9'

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -10,6 +10,8 @@ Incompatible Changes:
 
 Features:
 
+* #116 Add Django-4.2 support.
+* #83 Drop Django-2.2 support.
 * #83 Drop Python-3.6 support.
 * #127 Drop Python-3.7 support.
 * #83 Drop Django-2.2 support.

diff --git a/django_redshift_backend/__init__.py b/django_redshift_backend/__init__.py
@@ -1,4 +1,4 @@
-from django_redshift_backend.meta import DistKey, SortKey  # noqa
+from .meta import DistKey, SortKey  # noqa
 
 # py38 or later
 from importlib.metadata import version, PackageNotFoundError

diff --git a/django_redshift_backend/_vendor/__init__.py b/django_redshift_backend/_vendor/__init__.py
diff --git a/django_redshift_backend/_vendor/django40/__init__.py b/django_redshift_backend/_vendor/django40/__init__.py
diff --git a/django_redshift_backend/_vendor/django40/db/__init__.py b/django_redshift_backend/_vendor/django40/db/__init__.py
diff --git a/django_redshift_backend/_vendor/django40/db/backends/__init__.py b/django_redshift_backend/_vendor/django40/db/backends/__init__.py
diff --git a/django_redshift_backend/_vendor/django40/db/backends/base/__init__.py b/django_redshift_backend/_vendor/django40/db/backends/base/__init__.py