Skip to content

Commit 5871143

Browse files
authored
Merge pull request #193 from bckohan/dj6
Initial support for Django 6
2 parents b858882 + c1b1e3b commit 5871143

File tree

6 files changed

+166
-120
lines changed

6 files changed

+166
-120
lines changed

.github/workflows/lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ on:
77
push:
88
tags-ignore:
99
- '*'
10-
branches:
11-
- '*'
10+
branches: ['main']
1211
pull_request:
12+
branches: ['main']
1313
workflow_call:
1414
workflow_dispatch:
1515
inputs:

.github/workflows/test.yml

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ on:
77
push:
88
tags-ignore:
99
- '*'
10-
branches:
11-
- '*'
10+
branches: ['main']
1211
pull_request:
12+
branches: ['main']
1313
workflow_call:
1414
workflow_dispatch:
1515
inputs:
@@ -30,13 +30,14 @@ jobs:
3030
actions: write
3131
strategy:
3232
matrix:
33-
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14.0-rc.3']
33+
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
3434
django-version:
3535
- '3.2' # LTS April 2024
3636
- '4.2' # LTS April 2026
3737
- '5.0' # April 2025
3838
- '5.1' # December 2025
3939
- '5.2' # LTS April 2028
40+
- '6.0a1' # prerelease
4041
exclude:
4142
- python-version: '3.11'
4243
django-version: '3.2'
@@ -55,14 +56,26 @@ jobs:
5556
- python-version: '3.13'
5657
django-version: '5.0'
5758

58-
- python-version: '3.14.0-rc.3'
59+
- python-version: '3.14'
5960
django-version: '3.2'
60-
- python-version: '3.14.0-rc.3'
61+
- python-version: '3.14'
6162
django-version: '4.2'
62-
- python-version: '3.14.0-rc.3'
63+
- python-version: '3.14'
6364
django-version: '5.0'
64-
- python-version: '3.14.0-rc.3'
65+
- python-version: '3.14'
6566
django-version: '5.1'
67+
68+
- python-version: '3.9'
69+
django-version: '6.0a1'
70+
- python-version: '3.10'
71+
django-version: '6.0a1'
72+
- python-version: '3.11'
73+
django-version: '6.0a1'
74+
- python-version: '3.12'
75+
django-version: '6.0a1'
76+
- python-version: '3.13'
77+
django-version: '6.0a1'
78+
6679
env:
6780
COVERAGE_FILE: linux-py${{ matrix.python-version }}-dj${{ matrix.django-version }}.coverage
6881
TEST_PYTHON_VERSION: ${{ matrix.python-version }}
@@ -78,17 +91,23 @@ jobs:
7891
id: sp
7992
with:
8093
python-version: ${{ matrix.python-version }}
94+
allow-prereleases: true
8195

8296
- name: Setup Just
8397
uses: extractions/setup-just@v3
8498
- name: Install uv
8599
uses: astral-sh/setup-uv@v6
86100
with:
87101
enable-cache: true
88-
- name: Install Release Dependencies
102+
- name: Install Dependencies
103+
shell: bash
89104
run: |
90105
just setup ${{ steps.sp.outputs.python-path }}
91-
just test-lock "Django~=${{ matrix.django-version }}.0"
106+
if [[ "${{ matrix.django-version }}" =~ (a|b|rc) ]]; then
107+
just test-lock Django==${{ matrix.django-version }}
108+
else
109+
just test-lock Django~=${{ matrix.django-version }}.0
110+
fi
92111
- name: Install Emacs
93112
if: ${{ github.event.inputs.debug == 'true' }}
94113
run: |

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+
v3.3.4 (2025-09-27)
6+
===================
7+
8+
* Support for Django 6.0 - test against alpha
9+
10+
511
v3.3.3 (2025-09-22)
612
===================
713

pyproject.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
44

55
[project]
66
name = "django-render-static"
7-
version = "3.3.3"
7+
version = "3.3.4"
88
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."
99
requires-python = ">=3.9,<4.0"
1010
authors = [
@@ -17,7 +17,7 @@ repository = "https://github.com/bckohan/django-render-static"
1717
homepage = "https://django-render-static.readthedocs.io"
1818
keywords = ["django", "static", "templates", "javascript", "url", "reverse", "defines", "transpiler", "transpile", "enum"]
1919
dependencies = [
20-
"Django>=3.2,<6.0",
20+
"Django>=3.2,<6.1",
2121
"django-typer>=3.0,<4.0"
2222
]
2323
classifiers = [
@@ -33,6 +33,7 @@ classifiers = [
3333
"Framework :: Django :: 5.0",
3434
"Framework :: Django :: 5.1",
3535
"Framework :: Django :: 5.2",
36+
"Framework :: Django :: 6.0",
3637
"Intended Audience :: Developers",
3738
"License :: OSI Approved :: MIT License",
3839
"Natural Language :: English",

src/render_static/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
1818
"""
1919

20-
VERSION = (3, 3, 3)
20+
VERSION = (3, 3, 4)
2121

2222
__title__ = "Django Render Static"
2323
__version__ = ".".join(str(i) for i in VERSION)

0 commit comments

Comments
 (0)