Skip to content

Commit 02b0b76

Browse files
bckohanbckohan
authored
Merge pull request #137 from django-commons/py314
simplify CI with prerelease python flag
2 parents 73aab98 + 2f8d279 commit 02b0b76

File tree

3 files changed

+56
-30
lines changed

3 files changed

+56
-30
lines changed

‎.github/workflows/lint.yml‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,27 @@ jobs:
2828
strategy:
2929
matrix:
3030
# run static analysis on bleeding and trailing edges
31-
python-version: [ '3.9', '3.13' ]
31+
python-version: [ '3.9', '3.11', '3.14' ]
3232
django-version:
3333
- '3.2' # LTS April 2024
3434
- '4.2' # LTS April 2026
3535
- '5.2' # LTS April 2028
3636
exclude:
3737
- python-version: '3.9'
3838
django-version: '4.2'
39-
- python-version: '3.13'
40-
django-version: '3.2'
4139
- python-version: '3.9'
4240
django-version: '5.2'
4341

42+
- python-version: '3.11'
43+
django-version: '3.2'
44+
- python-version: '3.11'
45+
django-version: '5.2'
46+
47+
- python-version: '3.14'
48+
django-version: '3.2'
49+
- python-version: '3.14'
50+
django-version: '4.2'
51+
4452
env:
4553
RDBMS: sqlite
4654
TEST_PYTHON_VERSION: ${{ matrix.python-version }}
@@ -53,6 +61,7 @@ jobs:
5361
id: sp
5462
with:
5563
python-version: ${{ matrix.python-version }}
64+
allow-prereleases: true
5665
- name: Install uv
5766
uses: astral-sh/setup-uv@v6
5867
with:

‎.github/workflows/test.yml‎

Lines changed: 32 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
strategy:
3434
fail-fast: false
3535
matrix:
36-
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14.0-rc.3']
36+
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
3737
postgres-version: ['9.6', '12', 'latest']
3838
psycopg-version: ['psycopg2', 'psycopg3']
3939
django-version:
@@ -81,15 +81,15 @@ jobs:
8181
psycopg-version: 'psycopg2'
8282

8383

84-
- python-version: '3.14.0-rc.3'
84+
- python-version: '3.14'
8585
django-version: '3.2'
86-
- python-version: '3.14.0-rc.3'
86+
- python-version: '3.14'
8787
django-version: '4.2'
8888

89-
- python-version: '3.14.0-rc.3'
89+
- python-version: '3.14'
9090
django-version: '5.1'
9191
# https://github.com/psycopg/psycopg2/pull/1695
92-
- python-version: '3.14.0-rc.3'
92+
- python-version: '3.14'
9393
psycopg-version: 'psycopg2'
9494

9595
env:
@@ -130,6 +130,7 @@ jobs:
130130
uses: actions/setup-python@v6
131131
with:
132132
python-version: ${{ matrix.python-version }}
133+
allow-prereleases: true
133134
- name: Install uv
134135
uses: astral-sh/setup-uv@v6
135136
with:
@@ -174,16 +175,18 @@ jobs:
174175
strategy:
175176
fail-fast: false
176177
matrix:
177-
python-version: [ '3.9', '3.13']
178+
python-version: [ '3.9', '3.14']
178179
django-version:
179180
- '3.2' # LTS April 2024
180181
- '4.2' # LTS April 2026
181182
- '5.2' # LTS April 2028
182183
exclude:
183184
- python-version: '3.9'
184185
django-version: '5.2'
185-
- python-version: '3.13'
186+
- python-version: '3.14'
186187
django-version: '3.2'
188+
- python-version: '3.14'
189+
django-version: '4.2'
187190

188191
steps:
189192
- uses: actions/checkout@v5
@@ -192,6 +195,7 @@ jobs:
192195
id: sp
193196
with:
194197
python-version: ${{ matrix.python-version }}
198+
allow-prereleases: true
195199
- name: Install uv
196200
uses: astral-sh/setup-uv@v6
197201
with:
@@ -231,18 +235,20 @@ jobs:
231235
strategy:
232236
fail-fast: false
233237
matrix:
234-
python-version: [ '3.9', '3.13']
238+
python-version: [ '3.9', '3.14']
235239
mysql-version: ['5.7', 'latest']
236240
mysqlclient-version: ['1.4.3', '']
237241
django-version:
238242
- '3.2' # LTS April 2024
239243
- '4.2' # LTS April 2026
240244
- '5.2' # LTS April 2028
241245
exclude:
242-
- python-version: '3.13'
246+
- python-version: '3.14'
243247
django-version: '3.2'
244248
- python-version: '3.9'
245249
django-version: '5.2'
250+
- python-version: '3.14'
251+
django-version: '4.2'
246252

247253

248254
- django-version: '3.2'
@@ -291,6 +297,7 @@ jobs:
291297
id: sp
292298
with:
293299
python-version: ${{ matrix.python-version }}
300+
allow-prereleases: true
294301
- name: Install Emacs
295302
if: ${{ github.event.inputs.debug == 'true' }}
296303
run: |
@@ -340,7 +347,7 @@ jobs:
340347
strategy:
341348
fail-fast: false
342349
matrix:
343-
python-version: [ '3.9', '3.13']
350+
python-version: [ '3.9', '3.14']
344351
mysqlclient-version: ['1.4.3', '']
345352
mariadb-version: ['10.2', 'latest']
346353
mariadb-healthcheck: ["mysqladmin ping", "healthcheck.sh --connect --innodb_initialized"]
@@ -349,10 +356,12 @@ jobs:
349356
- '4.2' # LTS April 2026
350357
- '5.2' # LTS April 2028
351358
exclude:
352-
- python-version: '3.13'
359+
- python-version: '3.14'
353360
django-version: '3.2'
354361
- python-version: '3.9'
355362
django-version: '5.2'
363+
- python-version: '3.14'
364+
django-version: '4.2'
356365

357366
- django-version: '3.2'
358367
mariadb-version: 'latest'
@@ -396,6 +405,7 @@ jobs:
396405
id: sp
397406
with:
398407
python-version: ${{ matrix.python-version }}
408+
allow-prereleases: true
399409
- name: Install Emacs
400410
if: ${{ github.event.inputs.debug == 'true' }}
401411
run: |
@@ -497,6 +507,7 @@ jobs:
497507
uses: actions/setup-python@v6
498508
with:
499509
python-version: ${{ matrix.python-version }}
510+
allow-prereleases: true
500511
- name: Install Emacs
501512
if: ${{ github.event.inputs.debug == 'true' }}
502513
run: |
@@ -551,15 +562,17 @@ jobs:
551562
strategy:
552563
fail-fast: false
553564
matrix:
554-
python-version: [ '3.9', '3.13']
565+
python-version: [ '3.9', '3.14']
555566
django-version:
556567
- '3.2' # LTS April 2024
557568
- '5.2' # LTS April 2028
558569
exclude:
559570
- python-version: '3.9'
560571
django-version: '5.2'
561-
- python-version: '3.13'
572+
- python-version: '3.14'
562573
django-version: '3.2'
574+
- python-version: '3.14'
575+
django-version: '4.2'
563576

564577
steps:
565578
- uses: actions/checkout@v5
@@ -568,6 +581,7 @@ jobs:
568581
id: sp
569582
with:
570583
python-version: ${{ matrix.python-version }}
584+
allow-prereleases: true
571585
- name: Install uv
572586
uses: astral-sh/setup-uv@v6
573587
with:
@@ -612,15 +626,17 @@ jobs:
612626
strategy:
613627
fail-fast: false
614628
matrix:
615-
python-version: [ '3.9', '3.13']
629+
python-version: [ '3.9', '3.14']
616630
django-version:
617631
- '3.2' # LTS April 2024
618632
- '5.2' # LTS April 2028
619633
exclude:
620634
- python-version: '3.9'
621635
django-version: '5.2'
622-
- python-version: '3.13'
636+
- python-version: '3.14'
623637
django-version: '3.2'
638+
- python-version: '3.14'
639+
django-version: '4.2'
624640

625641
steps:
626642
- uses: actions/checkout@v5
@@ -629,6 +645,7 @@ jobs:
629645
id: sp
630646
with:
631647
python-version: ${{ matrix.python-version }}
648+
allow-prereleases: true
632649
- name: Install uv
633650
uses: astral-sh/setup-uv@v6
634651
with:

‎uv.lock‎

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)