From 3999f76706a21ac13d9e40b8fbf5e12d1391597e Mon Sep 17 00:00:00 2001 From: Brian Kohan Date: Tue, 12 Dec 2023 12:09:31 -0800 Subject: [PATCH 1/2] Update test.yml to include Django 5 in CI --- .github/workflows/test.yml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8a409b6..742d1fd 100644 --- 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 From a2213bcf576dab84ed92cf0070dd244b59477415 Mon Sep 17 00:00:00 2001 From: Brian Kohan Date: Tue, 12 Dec 2023 12:22:58 -0800 Subject: [PATCH 2/2] fix tests for 5.0, increment versions --- doc/requirements.txt | 2 +- doc/source/changelog.rst | 6 ++++++ pyproject.toml | 5 +++-- render_static/__init__.py | 2 +- render_static/tests/js_tests.py | 2 +- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/doc/requirements.txt b/doc/requirements.txt index 2d458bc..5a0d831 100644 --- 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 index 55f7ea5..4468428 100644 --- a/doc/source/changelog.rst +++ b/doc/source/changelog.rst @@ -2,6 +2,12 @@ Change Log ========== +v2.1.3 +====== + +* Fixed `Support Django 5.0 `_ + + v2.1.2 ====== diff --git a/pyproject.toml b/pyproject.toml index e95cde9..4f173cc 100644 --- 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 "] 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 index 48c70f3..88854ef 100755 --- 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 index 8bb6f1f..05968ea 100644 --- 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 [