From 71c08cbdf68556f5784750c49541dc3e25367c0c Mon Sep 17 00:00:00 2001 From: Luke Tainton Date: Thu, 28 Nov 2024 21:32:52 +0000 Subject: [PATCH 1/3] chore(ci): use Python 3.13 in CI --- .github/workflows/ci.yml | 2 ++ .github/workflows/release.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 49c1599..9154aa8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,6 +13,8 @@ on: jobs: ci: uses: luketainton/gha-workflows/.github/workflows/ci-python-poetry-with-docker.yml@main + with: + python_version: "3.13" secrets: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3e510bd..ce111ee 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,6 +7,8 @@ on: jobs: test: uses: luketainton/gha-workflows/.github/workflows/ci-python-poetry-with-docker.yml@main + with: + python_version: "3.13" secrets: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} -- 2.47.1 From 39a5639ba277e8a17f8e42198e2d874ee119d9a4 Mon Sep 17 00:00:00 2001 From: Luke Tainton Date: Thu, 28 Nov 2024 21:51:59 +0000 Subject: [PATCH 2/3] chore(ci): switch python_version to python-version --- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9154aa8..2f2c77d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: ci: uses: luketainton/gha-workflows/.github/workflows/ci-python-poetry-with-docker.yml@main with: - python_version: "3.13" + python-version: "3.13" secrets: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ce111ee..6d5a1ca 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,7 @@ jobs: test: uses: luketainton/gha-workflows/.github/workflows/ci-python-poetry-with-docker.yml@main with: - python_version: "3.13" + python-version: "3.13" secrets: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} -- 2.47.1 From 58abd518404e1034b8b93715d360fcd17b3b24f4 Mon Sep 17 00:00:00 2001 From: Luke Tainton Date: Thu, 28 Nov 2024 21:56:59 +0000 Subject: [PATCH 3/3] fix(imp): add compatibility module for imp deprecation --- Dockerfile | 4 +++- imp.py | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 imp.py diff --git a/Dockerfile b/Dockerfile index 8f7e896..1487a05 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,9 +3,11 @@ LABEL maintainer="Luke Tainton " LABEL org.opencontainers.image.source="https://github.com/luketainton/webexmemebot" 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 PYTHONPATH="/run:/usr/local/lib/python3.13/lib-dynload:/usr/local/lib/python3.13/site-packages:/usr/local/lib/python3.13" WORKDIR /run +COPY imp.py /run/imp.py + RUN mkdir -p /.local && \ chmod -R 777 /.local && \ pip install -U pip poetry diff --git a/imp.py b/imp.py new file mode 100644 index 0000000..864a550 --- /dev/null +++ b/imp.py @@ -0,0 +1,4 @@ +"""Compatibility module that imports all symbols from the importlib module. +and exposes them as imp.""" + +from importlib import * -- 2.47.1