Merge pull request #135 from bckohan/bckohan-patch-1

Support Django 5.0
bckohan · Dec 12, 2023 · 2abe33c · 2abe33c
2 parents 8582b61 + a2213bc
commit 2abe33c
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 10 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -13,9 +13,12 @@ jobs:
         django-version:
           - 'Django~=3.2.0' # LTS April 2024
           - 'Django~=4.2.0' # LTS April 2026
+          - 'Django~=5.0.0'
         exclude:
           - python-version: '3.9'
             django-version: 'Django~=4.2.0'
+          - python-version: '3.9'
+            django-version: 'Django~=5.0.0'
           - python-version: '3.12'
             django-version: 'Django~=3.2.0'
 
@@ -55,17 +58,21 @@ jobs:
         python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
         django-version:
           - 'Django~=3.2.0' # LTS April 2024
-          - 'Django~=4.1.0' # December 2023
           - 'Django~=4.2.0' # LTS April 2026
+          - 'Django~=5.0.0' # April 2025
         exclude:
-          - python-version: '3.7'
-            django-version: 'Django~=4.1.0'
-          - python-version: '3.7'
-            django-version: 'Django~=4.2.0'
           - python-version: '3.11'
             django-version: 'Django~=3.2.0'
           - python-version: '3.12'
             django-version: 'Django~=3.2.0'
+          - python-version: '3.7'
+            django-version: 'Django~=4.2.0'
+          - python-version: '3.7'
+            django-version: 'Django~=5.0.0'
+          - python-version: '3.8'
+            django-version: 'Django~=5.0.0'
+          - python-version: '3.9'
+            django-version: 'Django~=5.0.0'
 
     steps:
     - uses: actions/checkout@v3

diff --git a/doc/requirements.txt b/doc/requirements.txt
@@ -7,4 +7,4 @@ sphinxcontrib-jsmath==1.0.1; python_version >= "3.5"
 sphinxcontrib-qthelp==1.0.3; python_version >= "3.5"
 sphinxcontrib-serializinghtml==1.1.5; python_version >= "3.5"
 sphinx-js==3.2.2; python_version >= "3.5"
-django-render-static==2.1.2
+django-render-static==2.1.3
diff --git a/doc/source/changelog.rst b/doc/source/changelog.rst
@@ -2,6 +2,12 @@
 Change Log
 ==========
 
+v2.1.3
+======
+
+* Fixed `Support Django 5.0 <https://github.com/bckohan/django-render-static/issues/136>`_
+
+
 v2.1.2
 ======
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-render-static"
-version = "2.1.2"
+version = "2.1.3"
 description = "Use Django's template engine to render static files at deployment or package time. Includes transpilers for extending Django's url reversal and enums to JavaScript."
 authors = ["Brian Kohan <[email protected]>"]
 license = "MIT"
@@ -18,6 +18,7 @@ classifiers = [
     "Framework :: Django :: 4.0",
     "Framework :: Django :: 4.1",
     "Framework :: Django :: 4.2",
+    "Framework :: Django :: 5.0",
     "Intended Audience :: Developers",
     "License :: OSI Approved :: MIT License",
     "Natural Language :: English",
@@ -44,7 +45,7 @@ exclude = ["render_static/tests"]
 
 [tool.poetry.dependencies]
 python = ">=3.7,<4.0"
-Django = ">=3.2,<5.0"
+Django = ">=3.2,<6.0"
 #Django = [
 #    { version = "<4.0.0", python = ">=3.7,<=3.10" },
 #    { version = ">4.0.0,<4.1.0", python = ">=3.8,<3.11" },

diff --git a/render_static/__init__.py b/render_static/__init__.py
@@ -14,7 +14,7 @@
 from .transpilers.enums_to_js import EnumClassWriter
 from .transpilers.urls_to_js import ClassURLWriter, SimpleURLWriter
 
-VERSION = (2, 1, 2)
+VERSION = (2, 1, 3)
 
 __title__ = 'Django Render Static'
 __version__ = '.'.join(str(i) for i in VERSION)

diff --git a/render_static/tests/js_tests.py b/render_static/tests/js_tests.py
@@ -2460,7 +2460,7 @@ def test_bug_65_compiles(self):
 
         call_command('renderstatic', 'urls.js')
 
-        dj_gt41 = DJANGO_VERSION[0] >= 4 and DJANGO_VERSION[1] >= 1
+        dj_gt41 = DJANGO_VERSION[0:2] >= (4, 1)
 
         from django.urls import reverse
         for kwargs in [