Merge pull request #113 from ingvaldlorentzen/django-5

Django 5 Support

.github/workflows/test.yml

@@ -29,14 +29,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ "3.7.15", "3.8.13", "3.9.15", "3.10.8", "3.11.0" ]
-        django-version: [ "3.2", "4.0", "4.1" ]
+        python-version: [ "3.8.18", "3.9.18", "3.10.13", "3.11.7", "3.12.1"]
+        django-version: [ "3.2", "4.2", "5.0"]
         exclude:
-          # Django v4 drops Python 3.7 support
-          - django-version: 4.0
-            python-version: 3.7.15
-          - django-version: 4.1
-            python-version: 3.7.15
+          # Django v3 does not support Python >3.10
+          - django-version: 3.2
+            python-version: 3.11.7
+          - django-version: 3.2
+            python-version: 3.12.1
+          # Django v5 drops Python <3.10 support
+          - django-version: 5.0
+            python-version: 3.8.18
+          - django-version: 5.0
+            python-version: 3.9.18
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4

.pre-commit-config.yaml

@@ -1,11 +1,11 @@
 repos:
   - repo: https://github.com/ambv/black
-    rev: 22.10.0
+    rev: 23.12.1
     hooks:
       - id: black
         args: ['--quiet']
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
       - id: check-case-conflict
       - id: end-of-file-fixer
@@ -16,7 +16,7 @@ repos:
       - id: detect-private-key
       - id: double-quote-string-fixer
   - repo: https://github.com/pycqa/flake8
-    rev: 6.0.0
+    rev: 6.1.0
     hooks:
       - id: flake8
         additional_dependencies: [
@@ -31,19 +31,19 @@ repos:
         ]
         args: ['--enable-extensions=G']
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.2.2
+    rev: v3.15.0
     hooks:
       - id: pyupgrade
         args: ["--py36-plus"]
   - repo: https://github.com/pycqa/isort
-    rev: 5.10.1
+    rev: 5.13.2
     hooks:
       - id: isort
         files: 'django_guid/.*'
       - id: isort
         files: 'tests/.*'
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.991
+    rev: v1.8.0
     hooks:
       - id: mypy
         additional_dependencies:

LICENSE

@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

django_guid/__init__.py

@@ -2,7 +2,7 @@
 
 from django_guid.api import clear_guid, get_guid, set_guid  # noqa F401
 
-__version__ = '3.3.1'
+__version__ = '3.4.0'
 
 if django.VERSION < (3, 2):
     default_app_config = 'django_guid.apps.DjangoGuidConfig'

django_guid/config.py

@@ -98,7 +98,6 @@ def _validate_and_setup_integrations(self) -> None:
         """
         self.integration_settings.validate()
         for integration in self.integrations:
-
             # Make sure all integration methods are callable
             for method, name in [
                 (integration.setup, 'setup'),

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-guid"
-version = "3.3.1"  # Remember to also change __init__.py version
+version = "3.4.0"  # Remember to also change __init__.py version
 description = "Middleware that enables single request-response cycle tracing by injecting a unique ID into project logs"
 authors = ["Jonas Krüger Svensson <jonas-ks@hotmail.com>"]
 maintainers = ["Sondre Lillebø Gundersen <sondrelg@live.no>"]
@@ -46,10 +46,10 @@ packages = [{ include = 'django_guid' }]
 "Release notes" = "https://github.com/snok/django-guid/releases"
 
 [tool.poetry.dependencies]
-python = "^3.7"
+python = "^3.8"
 django = [
-    { version = "^3.1.1", python = "<3.8" },
-    { version = "^3.1.1 | ^4.0", python = ">=3.8" }
+    { version = "^3.2 | ^4.0", python = ">=3.8,<3.10" },
+    { version = "^4.0 | ^5.0", python = ">=3.10" }
 ]