Dependency updates for current Python (#235)

* Get building on current Poetry and Python

* Update actions to latest versions for Node 24

* Update pyproject for Poetry 2

* I love the formatter

* Fixing up type issues

* Update icalendar and Pillow

Author: JamesDearlove

.github/workflows/build-docker.yml

@@ -18,12 +18,12 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       # Login against the Docker registry
       # https://github.com/docker/login-action
       - name: Log into registry ${{ env.REGISTRY }}
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
@@ -32,7 +32,7 @@ jobs:
       # Build and push Docker image with Buildx
       # https://github.com/docker/build-push-action
       - name: Build and push Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v7
         with:
           context: .
           push: true

.github/workflows/run-black.yml

@@ -16,12 +16,12 @@ jobs:
         with:
           options: "--check --verbose"
           src: "./uqcsbot"
-          version: "23.12.1"
+          version: "26.5.1"
 
       - name: Convert logs to artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         if: always() && (steps.runBlack.outcome == 'failure')
         with:
           name: "black-logs"
           path: "/tmp/blk_*"
-          
+          

.github/workflows/run-tests.yml

@@ -6,8 +6,8 @@ on:
   pull_request:
 
 env: 
-  PYTHON_VERSION: '3.10'
-  POETRY_VERSION: '1.7.1'
+  PYTHON_VERSION: '3.13'
+  POETRY_VERSION: '2.4.1'
 
 jobs:
   tests:
@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
         # Local action that tries to cache as much of python & poetry as possible
       - name: Setup environment
@@ -34,7 +34,7 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
         # Local action that tries to cache as much of python & poetry as possible
       - name: Setup environment

.github/workflows/setup-python/action.yml

@@ -16,7 +16,7 @@ runs:
     # Get python
     # ------
     - name: Setup Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ inputs.python-version }}
 
@@ -25,7 +25,7 @@ runs:
     # ------
     - name: Check for cached poetry binary
       id: cached-poetry-binary
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: ~/.local
         # poetry depends on OS, python version, and poetry version
@@ -50,7 +50,7 @@ runs:
     # ------
     - name: Check for cached dependencies
       id: cached-poetry-dependencies
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: '**/.venv'
         # poetry dependencies depend on OS, python version, poetry version, and repository lockfile

Dockerfile

@@ -1,17 +1,16 @@
-FROM python:3.10-slim as python-base
+FROM python:3.13-slim AS python-base
 
 # Environment variables that should exist in all images.
 ENV PYTHONUNBUFFERED=1 \
     PIP_DISABLE_PIP_VERSION_CHECK=1 \
     PIP_DEFAULT_TIMEOUT=100 \
-    POETRY_NO_INTERACTION=1 \
-    POETRY_VERSION=1.7.1 \
+    POETRY_VERSION=2.4.1 \
     POETRY_VIRTUALENVS_IN_PROJECT=1 \
     POETRY_CACHE_DIR='/var/cache/pypoetry'
 
 
 # poetry-base stage installs Poetry and installs prod deps
-FROM python-base as poetry-base
+FROM python-base AS poetry-base
 
 WORKDIR /app
 RUN pip install "poetry==$POETRY_VERSION" && poetry --version
@@ -22,7 +21,7 @@ RUN poetry install --without=dev
 
 # dev stage continues off poetry-base to install dev deps
 # and have poetry available within the container.
-FROM poetry-base as dev
+FROM poetry-base AS dev
 
 ENV VIRTUAL_ENV=/app/.venv \
     PATH="/app/.venv/bin:$PATH"
@@ -35,7 +34,7 @@ ENTRYPOINT ["python", "-m", "uqcsbot"]
 
 # prod stage creates the final image for production and excludes
 # poetry as it is unneeded on prod.
-FROM python-base as prod
+FROM python-base AS prod
 
 ENV VIRTUAL_ENV=/app/.venv \
     PATH="/app/.venv/bin:$PATH"

docker-compose.yml

@@ -1,7 +1,4 @@
-version: '3'
-
 services:
-
   # Build the local Dockerfile to run UQCSbot itself.
   uqcsbot:
     build: 
@@ -20,7 +17,7 @@ services:
 
   # Build a database container for UQCSbot to use.
   database:
-    image: 'postgres:13'
+    image: 'postgres:17'
     restart: "unless-stopped"
     ports:
       - 5432:5432
@@ -35,3 +32,4 @@ services:
 # We want database data to persist, so we put it into a volume.
 volumes:
   database-data:
+

poetry.lock

@@ -1,43 +1,49 @@
-[tool.poetry]
+[project]
 name = "uqcsbot"
 version = "0.1.0"
 description = "UQCSbot is a chat bot built in Python for the UQCS Discord server."
-authors = ["UQ Computing Society <contact@uqcs.org.au>"]
+authors = [{name = "UQ Computing Society", email = "contact@uqcs.org"}]
 license = "MIT"
 
+[project.scripts]
+botdev = "dev.cli:main"
+
+[tool.poetry]
+package-mode = false
+requires-poetry = ">=2.0"
+
 [tool.poetry.dependencies]
-python = "^3.10"
-"discord.py" = "^2.3.2"
-icalendar = "^5.0"
+python = "^3.13"
+"discord.py" = "^2.7.1"
+icalendar = "^7.1.1"
 "python-dateutil" = "^2.9"
-requests = "^2.31"
-beautifulsoup4 = "^4.12"
-APScheduler = "^3.10"
-SQLAlchemy = {version = "^2.0.28", extras = ["postgresql_psycopg2binary"]}
-humanize = "^4.9"
-aiohttp = "^3.9"
-aio-mc-rcon = "^3.2.0"
+requests = "^2.34.2"
+beautifulsoup4 = "^4.14.3"
+APScheduler = "^3.11.2"
+SQLAlchemy = {version = "^2.0.49", extras = ["postgresql_psycopg2binary"]}
+humanize = "^4.15"
+aiohttp = "^3.13.5"
+aio-mc-rcon = "^3.4.2"
 PyYAML = "^6.0"
 mcstatus = "^11.1.0"
-pillow = "^11.0.0"
+pillow = "^12.0.0"
 tzdata = "*"
-
-[tool.poetry.scripts]
-botdev = "dev.cli:main"
+pytest = "^9.0.3"
+pytz = "^2026.2"
 
 [tool.poetry.group.dev.dependencies]
-pytest = "^7.4.4"
+pytest = "^9.0.3"
 pytest-datafiles = "^3.0.0"
 python-dotenv = "^1.0.0"
-black = "^23.12.0"
-pyright = "^1.1.316"
-types-requests = "^2.30.0.0"
+black = "^26.5.1"
+pyright = "^1.1.409"
+types-requests = "^2.33.0.0"
 types-beautifulsoup4 = "^4.12.0.4"
 types-python-dateutil = "^2.8.19.12"
-types-pytz = "^2023.3.0.0"
+types-pytz = "^2026.2.0.0"
 
 [build-system]
-requires = ["poetry-core>=1.3.0"]
+requires = ["poetry-core>=2.0.0"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.pyright]

pyproject.toml

@@ -64,9 +64,11 @@
         member.times[day].get(2, MAXIMUM_TIME_FOR_STAR),
     ),
     "Star 2 Time": lambda member, day: (
-        member.times[day][2] - member.times[day][1]
-        if 2 in member.times[day]
-        else MAXIMUM_TIME_FOR_STAR,
+        (
+            member.times[day][2] - member.times[day][1]
+            if 2 in member.times[day]
+            else MAXIMUM_TIME_FOR_STAR
+        ),
         member.times[day].get(1, MAXIMUM_TIME_FOR_STAR),
     ),
     "Star 1 & 2 Time": lambda member, day: (
@@ -478,24 +480,19 @@ async def help_command(
         """
         match command:
             case None:
-                await interaction.response.send_message(
-                    """
+                await interaction.response.send_message("""
 [Advent of Code](https://adventofcode.com/) is a yearly coding competition that occurs during the first 12 days (used to be 25 days before year 2025) of december. Coding puzzles are released at 3pm AEST each day, with two stars available for each puzzle. You can spend as long as you like on each puzzle, but UQCS also has a private leaderboard with prizes on offer.
 
 To join, go to <https://adventofcode.com/> and sign in. The UQCS private leaderboard join code is `989288-0ff5a98d`. To be eligible for prizes, you will also have to link your discord account. This can be done by using the `/advent register` command. Reach out to committee if you are having any issues.
 
 For more help, you can use `/advent help <command name>` to get information about a specific command.
-                    """
-                )
+                    """)
             case "help":
-                await interaction.response.send_message(
-                    """
+                await interaction.response.send_message("""
 `/advent help` is a help menu for all the Advent of Code commands. If you use `/advent help <command name>` you can see details of a particular command. Not much else to say here, try another command.
-                    """
-                )
+                    """)
             case "leaderboard":
-                await interaction.response.send_message(
-                    """
+                await interaction.response.send_message("""
 `/advent leaderboard` displays a leaderboard for the Advent of Code challenges. There are two types of leaderboard: for a single day, and for the entire month. These are selected by either providing the `day` option or not. You can also display the leaderboard for a past year or another leaderboard (say another private leaderboard that you have).
 
 There are 6 different sorting options, which do slightly different things depending on whether the leaderboard is for a single day or an entire month. The default sorting method changes on which type of leaderboard you want.
@@ -507,11 +504,9 @@ async def help_command(
  `Global         ` - This sorts by users global score. Note that this will only show users with global score. Note that this only works for year before 2025, as Advent of code remvoed global leaderboard for years after and including 2025.
 
 You can also style the leaderboard (i.e. change the columns). The default style will change depending on whether the leaderboard is for a single-day or the entire month, and depending on the sorting method. Styles consist of a string, with each character representing a column. Use `/advent help leaderboard-style` to see the possoble characters.
-                    """
-                )
+                    """)
             case "leaderboard_style":
-                await interaction.response.send_message(
-                    """
+                await interaction.response.send_message("""
 Not a command, but an option given to the command `/advent leaderboard` controlling the columns in the leaderboard. Each character in the given string represents a certain column. The possible characters are:
 The characters in the string can be:
  `#    ` - Provides a column of the form "XXX)" telling the order for the given leaderboard
@@ -527,41 +522,29 @@ async def help_command(
  `B    ` - A progress bar of the stars each person has
  `space` - A padding column of a single character
 All other characters will be ignored.
-                    """
-                )
+                    """)
             case "register":
-                await interaction.response.send_message(
-                    """
+                await interaction.response.send_message("""
 `/advent register` links an Advent of Code account and a discord user so that you are eligble for prizes. Each Advent of Code account and discord account can only be linked to one other account. Registrations persist across years. If you are having any issues with this, message committee to help.
-                    """
-                )
+                    """)
             case "register-force":
-                await interaction.response.send_message(
-                    """
+                await interaction.response.send_message("""
 `/advent register-force` is an admin-only command to force a registration (i.e. create a registration between any Advent of Code account and Discord user). This can be used for moderation, if someone is having difficulties registering or if you want to register someone for a previous year. This command can break things (such as creating duplicate registrations), so be careful. Exactly one of `aoc_name` or `aoc_id` should be given. Also note that you need to use the Discord ID, not the discord username. If you have developer options enables on your account, this can be found by right clicking on the user and selecting `Copy User ID`.
-                    """
-                )
+                    """)
             case "unregister":
-                await interaction.response.send_message(
-                    """
+                await interaction.response.send_message("""
 `/advent unregister` unlinks your discord account from the currently linked Advent of Code account. Message committee if you need any help.
-                    """
-                )
+                    """)
             case "unregister-force":
-                await interaction.response.send_message(
-                    """
+                await interaction.response.send_message("""
 `/advent unregister-force` is an admin-only command that removes a registration from the database. This can be used as a moderation tool, to remove someone who has registered to an Advent of Code account that isn't there. Note that you need to use the Discord ID, not the discord username. If you have developer options enables on your account, this can be found by right clicking on the user and selecting `Copy User ID`.
-                    """
-                )
+                    """)
             case "previous-winners":
-                await interaction.response.send_message(
-                    """
+                await interaction.response.send_message("""
 `/advent previous-winners` displays the previous winners for a particular year. Note that the records for year prior to 2022 may not be accurate, as the current system was not in use then.
-                    """
-                )
+                    """)
             case "new-winner":
-                await interaction.response.send_message(
-                    """
+                await interaction.response.send_message("""
 `/advent add-winner` is an admin-only command that allows you to either manually or randomly select winners. Participants will only be eligible to win if they have completed at least one star within the given times. For manual selection, provide an Advent of Code user ID (note that this is not the same as their Advent of Code name), otherwise a random winner will be drawn.
                     
 The arguments for the command have a bit of nuance. They are as follow:
@@ -572,14 +555,11 @@ async def help_command(
  `allow_repeat_winners    ` -  This allows participants to win multiple times from the same selection if `number_of_winners` is greater than 1. Note that regardless of this option, someone can win multiple times in a year, just not in a single selection.
  `allow_unregistered_users` - This allows Advent of Code accounts that do not have a linked discord account to win. Note that it can be difficult to give out prizes to users that do not have a linked discord.
  `year                    ` - The year the prize is for.
-                    """
-                )
+                    """)
             case "remove-winner":
-                await interaction.response.send_message(
-                    """
+                await interaction.response.send_message("""
 `/advent remove-winner` is an admin-only command that removes a winner from the database. It uses the database ID (which is distinct from the Advent of code user ID and the Discord user ID). You can find these ids by running `/advent previous-winners show_ids:True`.
-                    """
-                )
+                    """)
 
     @advent_command_group.command(name="leaderboard")
     @app_commands.describe(

uqcsbot/advent.py

@@ -267,7 +267,7 @@ def _get_coupons_from_page(source: SingleSource) -> List[Coupon]:
     if url == COUPONESE_DOMINOS_URL:
         soup_coupons = soup.find_all(class_="ov-coupon")
     elif url == FRUGAL_FEEDS_DOMINOS_URL:
-        tables = soup.select('[class^="tablepress"]')
+        tables = soup.find_all(class_="tablepress")
         for table in tables:
             # Headers have stuff we don't want
             rows = table.find_all("tr")[1:]