Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion doc/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 6 additions & 0 deletions doc/source/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
======

Expand Down
5 changes: 3 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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",
Expand All @@ -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" },
Expand Down
2 changes: 1 addition & 1 deletion render_static/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion render_static/tests/js_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 [
Expand Down