chore(deps): update dependency urllib3 to v2.5.0

.ARCHIVE/requirements.txt

@@ -1,13 +1,13 @@
-certifi==2025.6.15
+certifi==2025.4.26
 charset-normalizer==3.4.2
-click==8.2.1
-Flask==3.1.1
+click==8.1.8
+Flask==3.1.0
 Flask-WTF==1.2.2
 idna==3.10
 itsdangerous==2.2.0
 Jinja2==3.1.6
 MarkupSafe==3.0.2
-requests==2.32.4
+requests==2.32.3
 urllib3==2.5.0
 Werkzeug==3.1.3
 WTForms==3.2.1

.gitea/workflows/build_docker.yml

@@ -1,18 +1,18 @@
-# name: Build Docker
-# on:
-#   release:
-#     types:
-#       - published
+name: Build Docker
+on:
+  release:
+    types:
+      - published
 
-# jobs:
-#   create_docker:
-#     name: Create Docker Image
-#     uses: https://git.tainton.uk/actions/gha-workflows/.gitea/workflows/build-push-docker.yml@main
-#     with:
-#       release: ${{ gitea.event.release.name }}
-#       registry: ${{ vars.PACKAGES_REGISTRY_URL }}
-#       actions_username: ${{ vars.ACTIONS_USERNAME }}
-#       ghcr_username: ${{ vars.GHCR_USERNAME }}
-#     secrets:
-#       ACTIONS_TOKEN: ${{ secrets.ACTIONS_TOKEN }}
-#       GHCR_TOKEN: ${{ secrets.GHCR_TOKEN }}
+jobs:
+  create_docker:
+    name: Create Docker Image
+    uses: https://git.tainton.uk/actions/gha-workflows/.gitea/workflows/build-push-docker.yml@main
+    with:
+      release: ${{ gitea.event.release.name }}
+      registry: ${{ vars.PACKAGES_REGISTRY_URL }}
+      actions_username: ${{ vars.ACTIONS_USERNAME }}
+      ghcr_username: ${{ vars.GHCR_USERNAME }}
+    secrets:
+      ACTIONS_TOKEN: ${{ secrets.ACTIONS_TOKEN }}
+      GHCR_TOKEN: ${{ secrets.GHCR_TOKEN }}

.gitea/workflows/release.yml

@@ -2,101 +2,29 @@ name: Release
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 9 * * 0'
+    - cron: "0 9 * * 0"
 
 jobs:
-  # test:
-  #   name: Test
-  #   uses: https://git.tainton.uk/${{ gitea.repository }}/.gitea/workflows/ci.yml@main
-
-  tag:
-    name: Tag release
-    uses: https://git.tainton.uk/actions/gha-workflows/.gitea/workflows/release-with-tag.yaml@main
+  test:
+    name: Test
+    uses: https://git.tainton.uk/repos/roboluke/.gitea/workflows/ci.yml@main
+    with:
+      python-version: 3.13
+    secrets:
+      SONAR_HOST_URL: ${{ secrets.SONARQUBE_HOST_URL }}
+      SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }}
+      SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
 
   create_release:
     name: Create Release
-    needs: tag
-    uses: https://git.tainton.uk/actions/gha-workflows/.gitea/workflows/create-release-preexisting-tag.yaml@main
-    with:
-      tag: ${{ needs.tag.outputs.tag_name }}
-      body: ${{ needs.tag.outputs.changelog }}
+    needs: test
+    uses: https://git.tainton.uk/actions/gha-workflows/.gitea/workflows/create-release.yml@main
     secrets:
       ACTIONS_TOKEN: ${{ secrets.ACTIONS_TOKEN }}
 
-  create_docker:
-    name: Publish Docker Images
+  print_release:
+    name: Print Release
     runs-on: ubuntu-latest
-    needs: [tag, create_release]
+    needs: create_release
     steps:
-      - name: Update Docker configuration
-        continue-on-error: true
-        run: |
-          mkdir -p /etc/default
-          mkdir -p /etc/docker
-          touch -a /etc/default/docker
-          touch -a /etc/docker/daemon.json
-          echo "DOCKER_OPTS=\"--insecure-registry ${{ vars.PACKAGES_REGISTRY_URL }}\"" >> /etc/default/docker
-          echo "{\"insecure-registries\": [\"${{ vars.PACKAGES_REGISTRY_URL }}\"]}" > /etc/docker/daemon.json
-
-      - name: Get repo name
-        id: split
-        run: echo "repo=${REPO##*/}" >> "$GITEA_OUTPUT"
-        env:
-          REPO: ${{ gitea.repository }}
-
-      - name: Check out repository
-        uses: actions/checkout@v4.2.2
-        with:
-          fetch-depth: 0
-          ref: ${{ needs.tag.outputs.tag_name }}
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to Gitea Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ vars.PACKAGES_REGISTRY_URL }}
-          username: ${{ vars.ACTIONS_USERNAME }}
-          password: ${{ secrets.ACTIONS_TOKEN }}
-
-      - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ vars.GHCR_USERNAME }}
-          password: ${{ secrets.GHCR_TOKEN }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          tags: type=semver,pattern=v{{version}},value=${{ needs.tag.outputs.tag_name }}
-          images: |
-            ghcr.io/${{ vars.GHCR_USERNAME }}/${{ steps.split.outputs.repo }}
-            ${{ vars.PACKAGES_REGISTRY_URL }}/${{ gitea.repository }}
-
-      - name: Print metadata
-        run: |
-          printf "Annotations:\n${{ steps.meta.outputs.annotations }}"
-          echo ""
-          printf "Labels:\n${{ steps.meta.outputs.labels }}"
-          echo ""
-          printf "Tags:\n${{ steps.meta.outputs.tags }}"
-
-      - name: Build images
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          push: false
-          load: true
-          annotations: ${{ steps.meta.outputs.annotations }}
-          labels: ${{ steps.meta.outputs.labels }}
-          tags: ${{ steps.meta.outputs.tags }}
-
-      - name: Push images
-        run: |
-          strtags="${{ steps.meta.outputs.tags }}"
-          readarray -t lines <<<"$strtags"
-          for element in "${lines[@]}"; do docker push "$element"; done
-          unset strtags lines
+      - run: echo "Created release ${{ needs.create_release.outputs.release_name }}."

Dockerfile

@@ -1,26 +0,0 @@
-FROM python:3.13-slim
-LABEL maintainer="Luke Tainton <luke@tainton.uk>"
-USER root
-
-ENV PYTHONPATH="/run:/usr/local/lib/python3.11/lib-dynload:/usr/local/lib/python3.11/site-packages:/usr/local/lib/python3.11"
-ENV UV_PROJECT_ENVIRONMENT="/usr/local/"
-
-WORKDIR /run
-
-RUN mkdir -p /.local && \
-    chmod -R 777 /.local && \
-    pip install -U pip uv==0.5.14
-
-COPY pyproject.toml /run/pyproject.toml
-COPY uv.lock /run/uv.lock
-# needed for PDM build
-COPY README.md /run/README.md
-
-RUN uv sync --frozen
-
-ENTRYPOINT ["python3", "-B", "-m", "app.main"]
-
-ARG version="dev"
-ENV APP_VERSION=$version
-
-COPY app /run/app

app/app.py

@@ -4,26 +4,24 @@
 
 from flask import Flask, render_template, request
 from flask_wtf.csrf import CSRFProtect
-
 from app.send_page import send_page
 
+
 app = Flask(__name__)
 csrf = CSRFProtect(app)
 
-
-@app.route("/", methods=["GET"])
+@app.route("/", methods=['GET'])
 def index():
     """Returns index template."""
-    return render_template("index.html", status="")
+    return render_template('index.html', status='')
 
-
-@app.route("/", methods=["POST"])
+@app.route("/", methods=['POST'])
 def send():
     """POST function"""
     result = send_page(
-        name=request.form.get("name"),
-        email=request.form.get("email"),
-        message=request.form.get("message"),
+        name=request.form.get('name'),
+        email=request.form.get('email'),
+        message=request.form.get('message')
     )
-    status = "success" if result[0] else "fail"
-    return render_template("index.html", status=status)
+    status = 'success' if result[0] else 'fail'
+    return render_template('index.html', status=status)

app/send_page.py

@@ -3,31 +3,33 @@
 """Send messages via the Pushover API."""
 
 import os
-
 import requests
 
 
 def send_page(name: str, email: str, message: str) -> tuple:
     """POST to the Pushover API."""
     api_url = "https://api.pushover.net/1/messages.json"
-    api_token = os.getenv("PUSHOVER_API_TOKEN")
-    user_key = os.getenv("PUSHOVER_USER_KEY")
+    api_token = os.getenv('PUSHOVER_API_TOKEN')
+    user_key = os.getenv('PUSHOVER_USER_KEY')
 
     full_msg = f"Name: {name}\nEmail: {email}\n\nMessage: {message}"
 
     payload = {
-        "token": api_token,
-        "user": user_key,
-        "title": f"ePage from {name}",
-        "message": full_msg,
-        "priority": "1",
-        "sound": "cosmic",
+        'token': api_token,
+        'user': user_key,
+        'title': f"ePage from {name}",
+        'message': full_msg,
+        'priority': "1",
+        'sound': 'cosmic'
     }
 
     req = requests.post(
-        api_url, json=payload, headers={"Content-Type": "application/json"}, timeout=5
+        api_url,
+        json=payload,
+        headers={'Content-Type': 'application/json'},
+        timeout=5
     )
 
-    if req.status_code == 200 and req.json().get("status") == 1:
+    if req.status_code == 200 and req.json().get('status') == 1:
         return (True, None)
     return (False, req.json())

tests/__init__.py

@@ -3,7 +3,6 @@
 """PyTest unit tests."""
 
 import os
-
 import pytest
 
 from app.app import app, csrf

tests/test_app.py

@@ -3,10 +3,10 @@
 """Tests for app/app.py"""
 
 
-from tests import client  # pragma: no cover
+from tests import client  # pragma: no cover
 
 
 def test_index(client) -> None:
     """Ensure that the index page is loaded correctly."""
-    req = client.get("/")
+    req = client.get('/')
     assert req.status_code == 200 and "ePage" in req.text

tests/test_send_page.py

@@ -7,5 +7,9 @@ from app.send_page import send_page
 
 def test_send_page_no_env() -> None:
     """Ensure the API returns an error if no API key specified."""
-    result = send_page(name="Unit Test", email="none@none.com", message="Unit Test")
-    assert not result[0] and result[1].get("token") == "invalid"
+    result = send_page(
+        name='Unit Test',
+        email='none@none.com',
+        message='Unit Test'
+    )
+    assert not result[0] and result[1].get('token') == 'invalid'