Skip to content

Commit 47eced0

Browse files
authored
Merge pull request #49 from cclauss/patch-1
Add Python 3.14 to CI workflow matrix
2 parents c4a2135 + d44c159 commit 47eced0

File tree

3 files changed

+19
-6
lines changed

3 files changed

+19
-6
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
timeout-minutes: 60
99
name: Update docker cache
1010
steps:
11-
- uses: actions/checkout@v4
11+
- uses: actions/checkout@v5
1212
- name: Cache docker images
1313
id: custom-cache
1414
uses: actions/cache@v4
@@ -36,6 +36,7 @@ jobs:
3636
- '3.11'
3737
- '3.12'
3838
- '3.13'
39+
- '3.14'
3940
django-version:
4041
- 'django==4.2'
4142
- 'django==5.0'
@@ -46,16 +47,20 @@ jobs:
4647
- python-version: '3.13'
4748
django-version: "git+https://github.com/django/django.git@main#egg=Django"
4849
experimental: true
50+
- python-version: '3.14'
51+
django-version: "git+https://github.com/django/django.git@main#egg=Django"
52+
experimental: true
4953

5054
env:
5155
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
5256
steps:
53-
- uses: actions/checkout@v4
57+
- uses: actions/checkout@v5
5458

5559
- name: Set up Python ${{ matrix.python-version }}
5660
uses: actions/setup-python@v5
5761
with:
5862
python-version: ${{ matrix.python-version }}
63+
allow-prereleases: true
5964

6065
- name: Cache docker images
6166
id: custom-cache
@@ -69,7 +74,7 @@ jobs:
6974
run: docker image load -i ./custom-cache/all.tar
7075

7176
- name: Install uv
72-
uses: astral-sh/setup-uv@v5
77+
uses: astral-sh/setup-uv@v7
7378
with:
7479
enable-cache: true
7580

@@ -92,7 +97,6 @@ jobs:
9297
uv run pytest tests/*.py --ds=tests.settings.sqlite -x
9398
uv run pytest tests/*.py --ds=tests.settings.sqlite_herd -x
9499
uv run pytest tests/*.py --ds=tests.settings.sqlite_json -x
95-
uv run pytest tests/*.py --ds=tests.settings.sqlite_lz4 -x
96100
uv run pytest tests/*.py --ds=tests.settings.sqlite_msgpack -x
97101
uv run pytest tests/*.py --ds=tests.settings.sqlite_sentinel -x
98102
uv run pytest tests/*.py --ds=tests.settings.sqlite_sentinel_opts -x

django_valkey/compressors/lz4.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
1-
from lz4.frame import compress
2-
from lz4.frame import decompress
1+
import sys
2+
3+
try:
4+
from lz4.frame import compress
5+
from lz4.frame import decompress
6+
except ImportError: # python-lz4/python-lz4#302
7+
if sys.version_info >= (3, 14):
8+
compress = decompress = None
9+
else:
10+
raise
311

412
from django.conf import settings
513

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ classifiers = [
2727
"Programming Language :: Python :: 3.11",
2828
"Programming Language :: Python :: 3.12",
2929
"Programming Language :: Python :: 3.13",
30+
"Programming Language :: Python :: 3.14",
3031
"Framework :: Django :: 5.0",
3132
"Framework :: Django :: 5.1",
3233
"Framework :: Django :: 5.2",

0 commit comments

Comments
 (0)