Skip to content

Commit 2abe33c

Browse files
authored
Merge pull request #135 from bckohan/bckohan-patch-1
Support Django 5.0
2 parents 8582b61 + a2213bc commit 2abe33c

File tree

6 files changed

+24
-10
lines changed

6 files changed

+24
-10
lines changed

.github/workflows/test.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,12 @@ jobs:
1313
django-version:
1414
- 'Django~=3.2.0' # LTS April 2024
1515
- 'Django~=4.2.0' # LTS April 2026
16+
- 'Django~=5.0.0'
1617
exclude:
1718
- python-version: '3.9'
1819
django-version: 'Django~=4.2.0'
20+
- python-version: '3.9'
21+
django-version: 'Django~=5.0.0'
1922
- python-version: '3.12'
2023
django-version: 'Django~=3.2.0'
2124

@@ -55,17 +58,21 @@ jobs:
5558
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
5659
django-version:
5760
- 'Django~=3.2.0' # LTS April 2024
58-
- 'Django~=4.1.0' # December 2023
5961
- 'Django~=4.2.0' # LTS April 2026
62+
- 'Django~=5.0.0' # April 2025
6063
exclude:
61-
- python-version: '3.7'
62-
django-version: 'Django~=4.1.0'
63-
- python-version: '3.7'
64-
django-version: 'Django~=4.2.0'
6564
- python-version: '3.11'
6665
django-version: 'Django~=3.2.0'
6766
- python-version: '3.12'
6867
django-version: 'Django~=3.2.0'
68+
- python-version: '3.7'
69+
django-version: 'Django~=4.2.0'
70+
- python-version: '3.7'
71+
django-version: 'Django~=5.0.0'
72+
- python-version: '3.8'
73+
django-version: 'Django~=5.0.0'
74+
- python-version: '3.9'
75+
django-version: 'Django~=5.0.0'
6976

7077
steps:
7178
- uses: actions/checkout@v3

doc/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ sphinxcontrib-jsmath==1.0.1; python_version >= "3.5"
77
sphinxcontrib-qthelp==1.0.3; python_version >= "3.5"
88
sphinxcontrib-serializinghtml==1.1.5; python_version >= "3.5"
99
sphinx-js==3.2.2; python_version >= "3.5"
10-
django-render-static==2.1.2
10+
django-render-static==2.1.3

doc/source/changelog.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
Change Log
33
==========
44

5+
v2.1.3
6+
======
7+
8+
* Fixed `Support Django 5.0 <https://github.com/bckohan/django-render-static/issues/136>`_
9+
10+
511
v2.1.2
612
======
713

pyproject.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "django-render-static"
3-
version = "2.1.2"
3+
version = "2.1.3"
44
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."
55
authors = ["Brian Kohan <[email protected]>"]
66
license = "MIT"
@@ -18,6 +18,7 @@ classifiers = [
1818
"Framework :: Django :: 4.0",
1919
"Framework :: Django :: 4.1",
2020
"Framework :: Django :: 4.2",
21+
"Framework :: Django :: 5.0",
2122
"Intended Audience :: Developers",
2223
"License :: OSI Approved :: MIT License",
2324
"Natural Language :: English",
@@ -44,7 +45,7 @@ exclude = ["render_static/tests"]
4445

4546
[tool.poetry.dependencies]
4647
python = ">=3.7,<4.0"
47-
Django = ">=3.2,<5.0"
48+
Django = ">=3.2,<6.0"
4849
#Django = [
4950
# { version = "<4.0.0", python = ">=3.7,<=3.10" },
5051
# { version = ">4.0.0,<4.1.0", python = ">=3.8,<3.11" },

render_static/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
from .transpilers.enums_to_js import EnumClassWriter
1515
from .transpilers.urls_to_js import ClassURLWriter, SimpleURLWriter
1616

17-
VERSION = (2, 1, 2)
17+
VERSION = (2, 1, 3)
1818

1919
__title__ = 'Django Render Static'
2020
__version__ = '.'.join(str(i) for i in VERSION)

render_static/tests/js_tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2460,7 +2460,7 @@ def test_bug_65_compiles(self):
24602460

24612461
call_command('renderstatic', 'urls.js')
24622462

2463-
dj_gt41 = DJANGO_VERSION[0] >= 4 and DJANGO_VERSION[1] >= 1
2463+
dj_gt41 = DJANGO_VERSION[0:2] >= (4, 1)
24642464

24652465
from django.urls import reverse
24662466
for kwargs in [

0 commit comments

Comments
 (0)