Add 2023

Author: egeakman

.github/workflows/deploy.yml

@@ -3,10 +3,7 @@ name: Deploy to static server
 on:
   push:
     branches:
-      - ep2024
-      - ep2025
-  schedule:
-    - cron: "*/10 * * * *" # every 10 minutes
+      - ep2023
   workflow_dispatch:
 
 jobs:
@@ -31,12 +28,12 @@ jobs:
         run: make deps/install
 
       - name: Download data
-        run: uv run make download EXCLUDE="schedule" > /dev/null 2>&1
+        run: uv run make download > /dev/null 2>&1
         env:
             PRETALX_TOKEN: ${{ secrets.PRETALX_TOKEN }}
 
       - name: Transform data
-        run: uv run make transform EXCLUDE="schedule" > /dev/null 2>&1
+        run: uv run make transform > /dev/null 2>&1
 
       - name: Setup SSH
         uses: webfactory/[email protected]

Makefile

@@ -1,6 +1,6 @@
 # Variables for the project
 # =========================
-CONFERENCE ?= ep2025
+CONFERENCE ?= ep2023
 DATA_DIR ?= ./data/public/$(CONFERENCE)/
 
 # Variables for remote host

src/config.py

@@ -5,8 +5,8 @@
 
 
 class Config:
-    event = "europython-2025"
-    event_dir_name = "ep2025"
+    event = "europython-2023"
+    event_dir_name = "ep2023"
     project_root = Path(__file__).resolve().parents[1]
     raw_path = Path(f"{project_root}/data/raw/{event_dir_name}")
     public_path = Path(f"{project_root}/data/public/{event_dir_name}")

src/misc.py

@@ -2,19 +2,16 @@
 
 
 class SpeakerQuestion:
-    affiliation = "Company/Organization/Educational Institution"
-    homepage = "Social (Homepage)"
-    twitter = "Social (X/Twitter)"
-    bluesky = "Social (Bluesky)"
-    linkedin = "Social (LinkedIn)"
-    mastodon = "Social (Mastodon)"
-    gitx = "Social (GitHub/GitLab)"
+    affiliation = "Company / Institute"
+    homepage = "Homepage"
+    twitter_mastodon = "Twitter / Mastodon handle(s)"
+    linkedin = "LinkedIn"
+    gitx = "Github/Gitlab"
 
 
 class SubmissionQuestion:
-    outline = "Outline"
-    tweet = "Abstract as a short post (150 character max)"
-    delivery = "My presentation can be delivered in-person"
+    tweet = "Abstract as a tweet / toot"
+    delivery = "My presentation can be delivered"
     level = "Expected audience expertise"
 
 
@@ -41,14 +38,17 @@ class Room(Enum):
     club_h = "Club H"
 
     # Conference rooms
-    forum_hall = "Forum Hall"
+    forum_hall = "PyCharm (Forum Hall)"
     terrace_2a = "Terrace 2A"
     terrace_2b = "Terrace 2B"
     north_hall = "North Hall"
     south_hall_2a = "South Hall 2A"
     south_hall_2b = "South Hall 2B"
     exhibit_hall = "Exhibit Hall"
 
+    # Other rooms
+    open_space = "Open Space"
+
 
 class EventType(Enum):
     SESSION = "session"

src/models/europython.py

@@ -51,14 +51,11 @@ def extract_answers(cls, values) -> dict:
             if answer.question_text == SpeakerQuestion.homepage:
                 values["homepage"] = answer.answer_text
 
-            if answer.question_text == SpeakerQuestion.twitter:
-                values["twitter_url"] = cls.extract_twitter_url(answer.answer_text)
-
-            if answer.question_text == SpeakerQuestion.mastodon:
-                values["mastodon_url"] = cls.extract_mastodon_url(answer.answer_text)
-
-            if answer.question_text == SpeakerQuestion.bluesky:
-                values["bluesky_url"] = cls.extract_bluesky_url(answer.answer_text)
+            if answer.question_text == SpeakerQuestion.twitter_mastodon:
+                if extracted := cls.extract_twitter_url(answer.answer_text):
+                    values["twitter_url"] = extracted
+                elif extracted := cls.extract_mastodon_url(answer.answer_text):
+                    values["mastodon_url"] = extracted
 
             if answer.question_text == SpeakerQuestion.linkedin:
                 values["linkedin_url"] = cls.extract_linkedin_url(answer.answer_text)
@@ -164,41 +161,6 @@ def extract_linkedin_url(text: str) -> str | None:
 
         return linkedin_url
 
-    @staticmethod
-    def extract_bluesky_url(text: str) -> str | None:
-        """
-        Extracts a Bluesky profile URL from the given text.
-        Cleans the input and handles formats like:
-        - username
-        - bsky.app/profile/username
-        - bsky/username
-        - username.dev
-        - @username
-        - username.bsky.social
-        """
-        cleaned = EuroPythonSpeaker._clean_social_input(text)
-        if cleaned is None:
-            print(f"Invalid Bluesky URL: {text}")
-            return None
-
-        for marker in ("bsky.app/profile/", "bsky/"):
-            if marker in cleaned:
-                cleaned = cleaned.split(marker, 1)[1]
-                break
-        else:
-            cleaned = cleaned.rsplit("/", 1)[-1]
-
-        if "." not in cleaned:
-            cleaned += ".bsky.social"
-
-        bluesky_url = f"https://bsky.app/profile/{cleaned}"
-
-        if not re.match(r"^https://bsky\.app/profile/[\w\.-]+\.[\w\.-]+$", bluesky_url):
-            print(f"Invalid Bluesky URL: {bluesky_url}")
-            return None
-
-        return bluesky_url
-
     @staticmethod
     def extract_gitx_url(text: str) -> str | None:
         """