Merge branch 'main' into claude/issue-4408-20250727-1301

Author: marcoacierno

.pre-commit-config.yaml

@@ -9,7 +9,7 @@ aliases:
 
 repos:
     - repo: https://github.com/astral-sh/ruff-pre-commit
-      rev: 'v0.2.1'
+      rev: 'v0.12.5'
       hooks:
         - id: ruff
           args: [--fix, --exit-non-zero-on-fix]

.tool-versions

@@ -1,4 +1,4 @@
-nodejs    18.17.1
+nodejs 21.7.3
 terraform 1.3.4
 python    3.13.5
 rust      1.61.0

backend/Dockerfile

@@ -80,10 +80,8 @@ COPY --chown=app:app --from=js-stage ${FUNCTION_DIR}/dist/_astro ${FUNCTION_DIR}
 COPY --chown=app:app --from=build-stage ${FUNCTION_DIR}/.venv ${FUNCTION_DIR}/.venv
 
 COPY --chown=app:app . ${FUNCTION_DIR}
-
-USER app
+COPY ./entrypoint.sh /entrypoint.sh
 
 RUN mkdir -p assets && .venv/bin/python manage.py collectstatic --noinput
 
-ENTRYPOINT ["/home/app/.venv/bin/gunicorn"]
-CMD [ "pycon.wsgi" ]
+ENTRYPOINT ["/entrypoint.sh"]

backend/entrypoint.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e
+
+chown -R app:app /tmp
+
+exec su -p app -c "exec $*"

backend/pyproject.toml

@@ -51,14 +51,14 @@ dependencies = [
     "certifi==2024.7.4",
     "chardet==5.2.0",
     "idna==3.7",
-    "requests==2.32.3",
-    "urllib3==2.2.2",
+    "requests==2.32.4",
+    "urllib3==2.5.0",
     "aniso8601==9.0.1",
     "whitenoise==6.7.0",
     "django-ordered-model==3.5",
     "uwsgi==2.0.30",
     "django-storages==1.14.4",
-    "sentry-sdk==2.11.0",
+    "sentry-sdk>=2.14.0",
     "boto3==1.35.76",
     "pycountry<20.0,>=19.8",
     "countries<1.0.0,>=0.2.0",
@@ -68,8 +68,8 @@ dependencies = [
     "django-queryinspect<2.0.0,>=1.1.0",
     "lxml==6.0.0",
     "unidecode<2.0.0,>=1.1.1",
-    "strawberry-graphql==0.243.1",
-    "Werkzeug<2.0.0,>=1.0.1",
+    "strawberry-graphql==0.257.0",
+    "Werkzeug>=1.0.1,<4.0.0",
     "django-import-export<4.0.0,>=3.2.0",
     "dal-admin-filters==1.1.0",
     "django-markdownify==0.9.5",

frontend/src/components/blocks/socials-section.tsx

@@ -28,8 +28,8 @@ export const SocialsSection = ({ hashtag, label }: Props) => {
             hoverColor="green"
             socials={[
               {
-                icon: "twitter",
-                link: "https://twitter.com/pyconit",
+                icon: "mastodon",
+                link: "https://social.python.it/@pycon",
                 rel: "me",
               },
               {
@@ -48,8 +48,8 @@ export const SocialsSection = ({ hashtag, label }: Props) => {
                 rel: "me",
               },
               {
-                icon: "mastodon",
-                link: "https://social.python.it/@pycon",
+                icon: "twitter",
+                link: "https://twitter.com/pyconit",
                 rel: "me",
               },
             ]}

frontend/src/components/cfp-form/index.tsx

@@ -289,8 +289,8 @@ export const CfpForm = ({
         participantData.me.participant.website,
       );
       formState.setField(
-        "participantTwitterHandle",
-        participantData.me.participant.twitterHandle,
+        "participantMastodonHandle",
+        participantData.me.participant.mastodonHandle,
       );
       formState.setField(
         "participantInstagramHandle",
@@ -305,8 +305,8 @@ export const CfpForm = ({
         participantData.me.participant.facebookUrl,
       );
       formState.setField(
-        "participantMastodonHandle",
-        participantData.me.participant.mastodonHandle,
+        "participantTwitterHandle",
+        participantData.me.participant.twitterHandle,
       );
       formState.setField(
         "speakerAvailabilities",

frontend/src/components/edit-profile-page-handler/index.tsx

@@ -69,8 +69,8 @@ const onMyProfileFetched = (data: MyEditProfileQuery, formState) => {
     me.participant?.previousTalkVideo ?? "",
   );
   formState.setField(
-    "participantTwitterHandle",
-    me.participant?.twitterHandle ?? "",
+    "participantMastodonHandle",
+    me.participant?.mastodonHandle ?? "",
   );
   formState.setField(
     "participantInstagramHandle",
@@ -85,8 +85,8 @@ const onMyProfileFetched = (data: MyEditProfileQuery, formState) => {
     me.participant?.facebookUrl ?? "",
   );
   formState.setField(
-    "participantMastodonHandle",
-    me.participant?.mastodonHandle ?? "",
+    "participantTwitterHandle",
+    me.participant?.twitterHandle ?? "",
   );
 };
 

frontend/src/components/footer/index.tsx

@@ -72,7 +72,11 @@ export const Footer = () => {
           </div>
         }
         socials={[
-          { icon: "twitter", link: "https://twitter.com/pyconit", rel: "me" },
+          {
+            icon: "mastodon",
+            link: "https://social.python.it/@pycon",
+            rel: "me",
+          },
           {
             icon: "facebook",
             link: "https://www.facebook.com/pythonitalia",
@@ -88,11 +92,7 @@ export const Footer = () => {
             link: "https://www.linkedin.com/company/pycon-italia",
             rel: "me",
           },
-          {
-            icon: "mastodon",
-            link: "https://social.python.it/@pycon",
-            rel: "me",
-          },
+          { icon: "twitter", link: "https://twitter.com/pyconit", rel: "me" },
         ]}
       />
     </>

frontend/src/components/grant-form/index.tsx

@@ -220,8 +220,8 @@ export const GrantForm = ({
         participantData.me.participant.website,
       );
       formState.setField(
-        "participantTwitterHandle",
-        participantData.me.participant.twitterHandle,
+        "participantMastodonHandle",
+        participantData.me.participant.mastodonHandle,
       );
       formState.setField(
         "participantInstagramHandle",
@@ -236,8 +236,8 @@ export const GrantForm = ({
         participantData.me.participant.facebookUrl,
       );
       formState.setField(
-        "participantMastodonHandle",
-        participantData.me.participant.mastodonHandle,
+        "participantTwitterHandle",
+        participantData.me.participant.twitterHandle,
       );
     }
   }, []);