Skip to content

Commit 7eb6030

Browse files
authored
upgrade to python3.12.4 (#16105)
* upgrade to python3.12.4 * lint * take correct tag from hub.docker.com * update linter to py312 syntax * re-compile all deps
1 parent 280d3b4 commit 7eb6030

File tree

18 files changed

+57
-195
lines changed

18 files changed

+57
-195
lines changed

.python-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.11.9
1+
3.12.4

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ RUN NODE_ENV=production npm run build
3636

3737

3838
# We'll build a light-weight layer along the way with just docs stuff
39-
FROM python:3.11.9-slim-bookworm as docs
39+
FROM python:3.12.4-slim-bookworm as docs
4040

4141
# By default, Docker has special steps to avoid keeping APT caches in the layers, which
4242
# is good, but in our case, we're going to mount a special cache volume (kept between
@@ -105,7 +105,7 @@ USER docs
105105

106106
# Now we're going to build our actual application, but not the actual production
107107
# image that it gets deployed into.
108-
FROM python:3.11.9-slim-bookworm as build
108+
FROM python:3.12.4-slim-bookworm as build
109109

110110
# Define whether we're building a production or a development image. This will
111111
# generally be used to control whether or not we install our development and
@@ -189,7 +189,7 @@ RUN --mount=type=cache,target=/root/.cache/pip \
189189

190190
# Now we're going to build our actual application image, which will eventually
191191
# pull in the static files that were built above.
192-
FROM python:3.11.9-slim-bookworm
192+
FROM python:3.12.4-slim-bookworm
193193

194194
# Setup some basic environment variables that are ~never going to change.
195195
ENV PYTHONUNBUFFERED 1

bin/lint

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export LANG="${ENCODING:-en_US.UTF-8}"
1111
set -x
1212

1313
# Actually run our tests.
14-
find . -name '*.py' -exec python -m pyupgrade --py311-plus {} +
14+
find . -name '*.py' -exec python -m pyupgrade --py312-plus {} +
1515
python -m flake8 .
1616
python -m black --check --diff *.py warehouse/ tests/
1717
python -m isort --check *.py warehouse/ tests/

requirements/deploy.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# This file is autogenerated by pip-compile with Python 3.11
2+
# This file is autogenerated by pip-compile with Python 3.12
33
# by the following command:
44
#
55
# pip-compile --allow-unsafe --generate-hashes --output-file=requirements/deploy.txt requirements/deploy.in
@@ -215,3 +215,9 @@ zipp==3.19.2 \
215215
--hash=sha256:bf1dcf6450f873a13e952a29504887c89e6de7506209e5b1bcc3460135d4de19 \
216216
--hash=sha256:f091755f667055f2d02b32c53771a7a6c8b47e1fdbc4b72a8b9072b3eef8015c
217217
# via importlib-metadata
218+
219+
# The following packages are considered to be unsafe in a requirements file:
220+
setuptools==70.0.0 \
221+
--hash=sha256:54faa7f2e8d2d11bcd2c07bed282eef1046b5c080d1c32add737d7b5817b1ad4 \
222+
--hash=sha256:f211a66637b8fa059bb28183da127d4e86396c991a942b028c6650d4319c3fd0
223+
# via ddtrace

requirements/docs-blog.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# This file is autogenerated by pip-compile with Python 3.11
2+
# This file is autogenerated by pip-compile with Python 3.12
33
# by the following command:
44
#
55
# pip-compile --allow-unsafe --generate-hashes --output-file=requirements/docs-blog.txt requirements/docs-blog.in

requirements/docs-dev.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# This file is autogenerated by pip-compile with Python 3.11
2+
# This file is autogenerated by pip-compile with Python 3.12
33
# by the following command:
44
#
55
# pip-compile --allow-unsafe --generate-hashes --output-file=requirements/docs-dev.txt requirements/docs-dev.in

requirements/docs-user.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# This file is autogenerated by pip-compile with Python 3.11
2+
# This file is autogenerated by pip-compile with Python 3.12
33
# by the following command:
44
#
55
# pip-compile --allow-unsafe --generate-hashes --output-file=requirements/docs-user.txt requirements/docs-user.in

requirements/lint.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# This file is autogenerated by pip-compile with Python 3.11
2+
# This file is autogenerated by pip-compile with Python 3.12
33
# by the following command:
44
#
55
# pip-compile --allow-unsafe --generate-hashes --output-file=requirements/lint.txt requirements/lint.in
@@ -429,7 +429,6 @@ typing-extensions==4.12.1 \
429429
--hash=sha256:6024b58b69089e5a89c347397254e35f1bf02a907728ec7fee9bf0fe837d203a \
430430
--hash=sha256:915f5e35ff76f56588223f15fdd5938f9a1cf9195c0de25130c627e4d597f6d1
431431
# via
432-
# boto3-stubs
433432
# celery-types
434433
# mypy
435434
zope-event==5.0 \

requirements/main.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ b2sdk
66
Babel
77
bcrypt
88
boto3
9-
celery[sqs]>=5.2.2,<5.3.2
9+
celery[sqs]>=5.3.5,<5.4
1010
celery-redbeat
1111
certifi
1212
click
@@ -25,7 +25,7 @@ html5lib
2525
humanize
2626
itsdangerous
2727
Jinja2>=2.8
28-
kombu[sqs]<5.3.2 # https://github.com/jazzband/pip-tools/issues/1577
28+
kombu[sqs]>=5.3.5,<5.4 # https://github.com/jazzband/pip-tools/issues/1577
2929
limits
3030
linehaul
3131
lxml

requirements/main.txt

Lines changed: 7 additions & 150 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)