Update actions to Node 20 & Deps update (#197)

* Cause chaos, update actions to Node 20

* Updating deps, update actions with matching dep versions

* Fix up some new typing issues

* Remember to check style challenge (very hard)

.github/workflows/build-docker.yml

@@ -18,12 +18,12 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Login against the Docker registry
       # https://github.com/docker/login-action
       - name: Log into registry ${{ env.REGISTRY }}
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         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@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           push: true

.github/workflows/run-black.yml

@@ -8,18 +8,18 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Run black
         id: runBlack
         uses: psf/black@stable
         with:
           options: "--check --verbose"
           src: "./uqcsbot"
-          version: "23.3.0"
+          version: "23.12.1"
 
       - name: Convert logs to artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: always() && (steps.runBlack.outcome == 'failure')
         with:
           name: "black-logs"

.github/workflows/run-tests.yml

@@ -7,7 +7,7 @@ on:
 
 env: 
   PYTHON_VERSION: '3.10'
-  POETRY_VERSION: '1.4.2'
+  POETRY_VERSION: '1.7.1'
 
 jobs:
   tests:
@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
         # 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@v3
+        uses: actions/checkout@v4
 
         # 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@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ inputs.python-version }}
 
@@ -25,7 +25,7 @@ runs:
     # ------
     - name: Check for cached poetry binary
       id: cached-poetry-binary
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       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@v3
+      uses: actions/cache@v4
       with:
         path: '**/.venv'
         # poetry dependencies depend on OS, python version, poetry version, and repository lockfile

Dockerfile

@@ -5,7 +5,7 @@ ENV PYTHONUNBUFFERED=1 \
     PIP_DISABLE_PIP_VERSION_CHECK=1 \
     PIP_DEFAULT_TIMEOUT=100 \
     POETRY_NO_INTERACTION=1 \
-    POETRY_VERSION=1.4.2 \
+    POETRY_VERSION=1.7.1 \
     POETRY_VIRTUALENVS_IN_PROJECT=1 \
     POETRY_CACHE_DIR='/var/cache/pypoetry'
 

pyproject.toml

@@ -7,16 +7,16 @@ license = "MIT"
 
 [tool.poetry.dependencies]
 python = "^3.10"
-"discord.py" = "^2.2.3"
+"discord.py" = "^2.3.2"
 icalendar = "^5.0"
-"python-dateutil" = "^2.8"
+"python-dateutil" = "^2.9"
 pytz = "^2023.3"
-requests = "^2.28"
+requests = "^2.31"
 beautifulsoup4 = "^4.12"
 APScheduler = "^3.10"
-SQLAlchemy = {version = "^2.0.12", extras = ["postgresql_psycopg2binary"]}
-humanize = "^4.3"
-aiohttp = "^3.8"
+SQLAlchemy = {version = "^2.0.28", extras = ["postgresql_psycopg2binary"]}
+humanize = "^4.9"
+aiohttp = "^3.9"
 aio-mc-rcon = "^3.2.0"
 PyYAML = "^6.0"
 mcstatus = "^11.1.0"
@@ -25,10 +25,10 @@ mcstatus = "^11.1.0"
 botdev = "dev.cli:main"
 
 [tool.poetry.group.dev.dependencies]
-pytest = "^7.3.1"
+pytest = "^7.4.4"
 pytest-datafiles = "^3.0.0"
 python-dotenv = "^1.0.0"
-black = "^23.3.0"
+black = "^23.12.0"
 pyright = "^1.1.316"
 types-requests = "^2.30.0.0"
 types-beautifulsoup4 = "^4.12.0.4"

uqcsbot/dominos_coupons.py

@@ -59,8 +59,11 @@ async def dominoscoupons(
         try:
             coupons = _get_coupons(number_of_coupons, ignore_expiry, keywords.split())
         except RequestException as error:
+            resp_content = (
+                error.response.content if error.response else "No response error given."
+            )
             logging.warning(
-                f"Could not connect to dominos coupon site ({COUPONESE_DOMINOS_URL}): {error.response.content}"
+                f"Could not connect to dominos coupon site ({COUPONESE_DOMINOS_URL}): {resp_content}"
             )
             await interaction.edit_original_response(
                 content=f"Sadly could not reach the coupon website (<{COUPONESE_DOMINOS_URL}>)..."

uqcsbot/holidays.py

@@ -103,7 +103,10 @@ def get_holiday_page() -> bytes | None:
         response = requests.get(HOLIDAY_URL)
         return response.content
     except RequestException as e:
-        logging.warning(e.response.content)
+        resp_content = e.response.content if e.response else "No response error given."
+        logging.warning(
+            f"(RequestException) Could not fetch {HOLIDAY_URL}: {resp_content}"
+        )
 
 
 class Holidays(commands.Cog):