Skip to content

Commit 78208fb

Browse files
authored
Merge pull request #665 from bckohan/dj6
support django 6 and python 3.14, update databases in CI
2 parents 5b91870 + c26b84a commit 78208fb

File tree

8 files changed

+504
-476
lines changed

8 files changed

+504
-476
lines changed

.github/workflows/lint.yml

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,26 @@ jobs:
2626
strategy:
2727
matrix:
2828
# run static analysis on bleeding and trailing edges
29-
python-version: [ '3.9', '3.10', '3.13' ]
29+
python-version: [ '3.10', '3.12', '3.14' ]
3030
django-version:
3131
- '4.2' # LTS April 2026
32-
- '5.2' # December 2025
32+
- '5.2' # LTS April December 2027
33+
- '6.0rc1' #
3334
exclude:
34-
- python-version: '3.9'
35+
- python-version: '3.12'
3536
django-version: '4.2'
36-
- python-version: '3.13'
37+
- python-version: '3.14'
3738
django-version: '4.2'
38-
- python-version: '3.9'
39-
django-version: '5.2'
39+
4040
- python-version: '3.10'
4141
django-version: '5.2'
42+
- python-version: '3.14'
43+
django-version: '5.2'
44+
45+
- python-version: '3.10'
46+
django-version: '6.0rc1'
47+
- python-version: '3.12'
48+
django-version: '6.0rc1'
4249

4350
env:
4451
TEST_PYTHON_VERSION: ${{ matrix.python-version }}
@@ -62,7 +69,11 @@ jobs:
6269
- name: Install Dependencies
6370
run: |
6471
just setup ${{ steps.sp.outputs.python-path }}
65-
just test-lock Django~=${{ matrix.django-version }}.0
72+
if [[ "${{ matrix.django-version }}" =~ (a|b|rc) ]]; then
73+
just test-lock Django==${{ matrix.django-version }}
74+
else
75+
just test-lock Django~=${{ matrix.django-version }}.0
76+
fi
6677
just install-docs
6778
- name: Install Emacs
6879
if: ${{ github.event.inputs.debug == 'true' }}

0 commit comments

Comments
 (0)