Skip to content

Commit 0f6042d

Browse files
author
quantra
committed
python 3.12 support
imagekit_cleanup.py bugfix
1 parent 14fc837 commit 0f6042d

File tree

6 files changed

+9
-6
lines changed

6 files changed

+9
-6
lines changed

compose/local/django/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG PYTHON_VERSION=3.10-slim-bullseye
1+
ARG PYTHON_VERSION=3.12-slim-bullseye
22

33
# define an alias for the specfic python version used in this file.
44
FROM arm64v8/python:${PYTHON_VERSION} as python

compose/local/tox/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ FROM quantra2112/ci-images-arm
22

33
USER root
44

5+
RUN apt update && apt install -y libpq-dev build-essential libjpeg-dev libpng-dev libwebp-dev && apt install --reinstall python3-pkg-resources python3-setuptools
6+
57
ARG BUILD_ENVIRONMENT=local
68
ARG APP_HOME=/app
79

lazy_srcset/management/commands/imagekit_cleanup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def process_file(self, file, path):
5151
Delete images that no longer have a source.
5252
"""
5353
source_path = path.relative_to(self.root_path)
54-
source_file = re.sub(r"\.[a-z0-9]+\.", ".", file) # noqa
54+
source_file = re.sub(r"\.[^\.]+\.([^\.]+$)", ".\1", file) # noqa
5555

5656
if not self.file_exists(source_path, source_file):
5757
filepath = path / file

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
django<5.0
2-
Pillow<10.0
2+
Pillow
33
django-imagekit

setup.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ classifiers =
2727
Programming Language :: Python :: 3.9
2828
Programming Language :: Python :: 3.10
2929
Programming Language :: Python :: 3.11
30+
Programming Language :: Python :: 3.12
3031
Topic :: Internet :: WWW/HTTP
3132
Topic :: Internet :: WWW/HTTP :: Dynamic Content
3233
Topic :: Internet :: WWW/HTTP :: Site Management

tox.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
minversion = 3.8.0
44
skipsdist = false
55
envlist =
6-
py37-django{32,main}-{linux,macos,windows}
76
py38-django{32,40,41,42,main}-{linux,macos,windows}
87
py39-django{32,40,41,42,main}-{linux,macos,windows}
98
py310-django{32,40,41,42,main}-{linux,macos,windows}
10-
py311-django{32,40,41,42,main}-{linux}
9+
py311-django{32,40,41,42,main}-{linux,macos,windows}
10+
py312-django{32,40,41,42,main}-{linux}
1111
skip_missing_interpreters = true
1212

1313
[gh-actions]
1414
python =
15-
3.7: py37
1615
3.8: py38
1716
3.9: py39
1817
3.10: py310
1918
3.11: py311
19+
3.12: py312
2020

2121
[gh-actions:env]
2222
PLATFORM =

0 commit comments

Comments
 (0)