Skip to content

Commit 0f83f61

Browse files
committed
Merge branch 'main' into claude/issue-4408-20250727-1301
2 parents 4141551 + e173050 commit 0f83f61

11 files changed

Lines changed: 2271 additions & 2208 deletions

File tree

.github/workflows/backend-checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- uses: actions/checkout@v4
1919
- uses: actions/setup-python@v5
2020
with:
21-
python-version: "3.11.6"
21+
python-version: "3.13.5"
2222
- name: Install uv
2323
uses: astral-sh/setup-uv@v4
2424
id: setup-uv

.github/workflows/backend-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
- uses: actions/checkout@v4
3939
- uses: actions/setup-python@v5
4040
with:
41-
python-version: "3.11.6"
41+
python-version: "3.13.5"
4242
- name: Install uv
4343
uses: astral-sh/setup-uv@v4
4444
id: setup-uv

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
nodejs 18.17.1
22
terraform 1.3.4
3-
python 3.11.2
3+
python 3.13.5
44
rust 1.61.0
55
pnpm 9
66
opentofu 1.9.0

Dockerfile.python.local

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG FUNCTION_DIR="/home/app/"
22

3-
FROM python:3.11
3+
FROM python:3.13.5
44

55
RUN apt update -y && apt install -y ffmpeg libsm6 libxext6
66

backend/Dockerfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# check=skip=SecretsUsedInArgOrEnv
22
ARG FUNCTION_DIR="/home/app"
33

4-
FROM python:3.11-slim AS base
4+
FROM python:3.13.5-slim AS base
55

66
ENV DJANGO_SETTINGS_MODULE=pycon.settings.prod \
77
AWS_MEDIA_BUCKET=example \
@@ -72,7 +72,7 @@ ENV LIBRARY_PATH=/lib:/usr/lib LD_LIBRARY_PATH=/lib:/usr/lib
7272

7373
RUN apt-get update -y && apt-get install -y curl
7474

75-
RUN groupadd -r app && useradd -r -g app app && mkdir -p ${FUNCTION_DIR} && chown -R app:app ${FUNCTION_DIR} && mkdir -p /tmp/pycon && chown -R app:app /tmp/pycon
75+
RUN groupadd -r app && useradd -r -g app app && mkdir -p ${FUNCTION_DIR} && chown -R app:app ${FUNCTION_DIR}
7676

7777
COPY --chown=app:app --from=js-stage ${FUNCTION_DIR}/dist/*.html ${FUNCTION_DIR}/custom_admin/templates/astro/
7878
COPY --chown=app:app --from=js-stage ${FUNCTION_DIR}/dist/widgets/*.html ${FUNCTION_DIR}/custom_admin/templates/astro/widgets/
@@ -83,8 +83,6 @@ COPY --chown=app:app . ${FUNCTION_DIR}
8383

8484
USER app
8585

86-
VOLUME ["/tmp/pycon"]
87-
8886
RUN mkdir -p assets && .venv/bin/python manage.py collectstatic --noinput
8987

9088
ENTRYPOINT ["/home/app/.venv/bin/gunicorn"]

backend/pyproject.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
[tool.ruff]
33
line-length = 88
44
exclude = ["migrations"]
5-
target-version = "py311"
5+
target-version = "py313"
66

77
[tool.ruff.lint.isort]
88
known-first-party = [
@@ -42,11 +42,11 @@ known-first-party = [
4242

4343

4444
[project]
45-
requires-python = "<3.13,>=3.11"
45+
requires-python = ">=3.13.5"
4646
dependencies = [
4747
"django==5.1.4",
4848
"django-environ==0.10.0",
49-
"django-model-utils==4.5.1",
49+
"django-model-utils==5.0.0",
5050
"django-timezone-field==7.0",
5151
"certifi==2024.7.4",
5252
"chardet==5.2.0",
@@ -56,7 +56,7 @@ dependencies = [
5656
"aniso8601==9.0.1",
5757
"whitenoise==6.7.0",
5858
"django-ordered-model==3.5",
59-
"uWSGI==2.0.26",
59+
"uwsgi==2.0.30",
6060
"django-storages==1.14.4",
6161
"sentry-sdk==2.11.0",
6262
"boto3==1.35.76",
@@ -66,7 +66,7 @@ dependencies = [
6666
"hashids<2.0.0,>=1.2.0",
6767
"django-autocomplete-light==3.9.4",
6868
"django-queryinspect<2.0.0,>=1.1.0",
69-
"lxml<5.0.0,>=4.5.0",
69+
"lxml==6.0.0",
7070
"unidecode<2.0.0,>=1.1.1",
7171
"strawberry-graphql==0.243.1",
7272
"Werkzeug<2.0.0,>=1.0.1",
@@ -89,7 +89,7 @@ dependencies = [
8989
"Jinja2>=3.1.3",
9090
"icalendar>=5.0.11",
9191
"pyclamd>=0.4.0",
92-
"magika>=0.5.1",
92+
"magika==0.6.2",
9393
"tzdata>=2024.1",
9494
"wagtail-factories==4.2.1",
9595
"google-auth-oauthlib>=1.2.1",

backend/uv.lock

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

backend/video_uploads/transfer.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ def __init__(
5555
self.merged_file = None
5656

5757
def run(self) -> list[str]:
58-
os.makedirs("/tmp/pycon/", exist_ok=True)
59-
6058
self.storage = storages["default"]
6159
self.s3_client = self._get_s3_client()
6260
self.download_link = self.get_download_link()
@@ -188,7 +186,7 @@ def merge_parts(self, parts: list[str]):
188186

189187
self.merged_file = tempfile.NamedTemporaryFile(
190188
"wb",
191-
prefix=f"/tmp/pycon/wetransfer_{self.wetransfer_to_s3_transfer_request.id}",
189+
prefix=f"wetransfer_{self.wetransfer_to_s3_transfer_request.id}",
192190
suffix=self.extension,
193191
delete=False,
194192
)
@@ -209,7 +207,7 @@ def download_part(self, part_info: PartInfo) -> str:
209207

210208
part_file = tempfile.NamedTemporaryFile(
211209
"wb",
212-
prefix=f"/tmp/pycon/wetransfer_{self.wetransfer_to_s3_transfer_request.id}.part{part_info.part_number}",
210+
prefix=f"wetransfer_{self.wetransfer_to_s3_transfer_request.id}.part{part_info.part_number}",
213211
suffix=self.extension,
214212
delete=False,
215213
)

frontend/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"@graphql-codegen/typescript-react-apollo": "^4.3.2",
2626
"@neshca/cache-handler": "^1.9.0",
2727
"@python-italia/pycon-styleguide": "0.1.210",
28-
"@sentry/nextjs": "^8.45.0",
28+
"@sentry/nextjs": "^9.42.0",
2929
"@vercel/analytics": "^1.1.1",
3030
"@vercel/og": "^0.6.5",
3131
"@vercel/speed-insights": "^1.0.12",
@@ -42,7 +42,7 @@
4242
"graphql-tag": "^2.12.6",
4343
"marksy": "^8.0.0",
4444
"moment": "^2.29.1",
45-
"next": "15.2.3",
45+
"next": "15.2.4",
4646
"next-cookies": "^2.0.3",
4747
"pdfkit": "^0.15.1",
4848
"react": "19.0.0",

0 commit comments

Comments
 (0)