From 175e6dc843a73881da682ea5d0d1ea03aaa602fa Mon Sep 17 00:00:00 2001 From: Alexander Todorov Date: Thu, 4 Jun 2026 13:55:37 +0300 Subject: [PATCH 1/3] Revert "Update Docker image reference" This reverts commit 33fa7c343ca666cff103353c6a59a88164c657c1. --- tests/Dockerfile.kiwitcms | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Dockerfile.kiwitcms b/tests/Dockerfile.kiwitcms index 530aec7..d82b324 100644 --- a/tests/Dockerfile.kiwitcms +++ b/tests/Dockerfile.kiwitcms @@ -1,4 +1,4 @@ -FROM pub.kiwitcms.eu/kiwitcms/kiwi +FROM kiwitcms/kiwi USER 0 RUN microdnf -y --nodocs install gcc krb5-devel python3.11-devel psmisc && \ From 4a4f4f33a8babba0f42108c42a24dee58828903f Mon Sep 17 00:00:00 2001 From: Alexander Todorov Date: Thu, 4 Jun 2026 13:32:08 +0300 Subject: [PATCH 2/3] Build and test with Python 3.12 --- .github/workflows/integration.yml | 4 ++-- .github/workflows/publish-package.yml | 2 +- docker-compose.yml | 2 +- setup.py | 4 +--- tests/Dockerfile.kiwitcms | 10 +++++----- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 0d320b5..658114a 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -19,7 +19,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.11] + python-version: [3.12] steps: - uses: actions/checkout@v6 @@ -44,7 +44,7 @@ jobs: # note: always use the -latest OS variants b/c if conditions # match them as literals os: [ubuntu-latest] - python-version: [3.11] + python-version: [3.12] steps: diff --git a/.github/workflows/publish-package.yml b/.github/workflows/publish-package.yml index 0e44709..74e2985 100644 --- a/.github/workflows/publish-package.yml +++ b/.github/workflows/publish-package.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.11] + python-version: [3.12] steps: - uses: actions/checkout@v6 diff --git a/docker-compose.yml b/docker-compose.yml index 76f21f6..4b18b7b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,7 +12,7 @@ services: restart: always volumes: - web_kiwitcms_org_coverage:/coverage - - ./social_auth_kerberos/:/venv/lib64/python3.11/site-packages/social_auth_kerberos/:z,ro + - ./social_auth_kerberos/:/venv/lib64/python3.12/site-packages/social_auth_kerberos/:z,ro volumes: web_kiwitcms_org_coverage: diff --git a/setup.py b/setup.py index 91568b7..e695498 100644 --- a/setup.py +++ b/setup.py @@ -26,8 +26,6 @@ def get_long_description(): "Intended Audience :: Developers", "License :: OSI Approved :: GNU General Public License v2 (GPLv2)", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", ], ) diff --git a/tests/Dockerfile.kiwitcms b/tests/Dockerfile.kiwitcms index d82b324..f2d4ba7 100644 --- a/tests/Dockerfile.kiwitcms +++ b/tests/Dockerfile.kiwitcms @@ -1,18 +1,18 @@ FROM kiwitcms/kiwi USER 0 -RUN microdnf -y --nodocs install gcc krb5-devel python3.11-devel psmisc && \ - microdnf clean all && mkdir /coverage && chown 1001:0 /coverage +RUN dnf -y --nodocs install gcc krb5-devel python3.12-devel psmisc && \ + dnf clean all && mkdir /coverage && chown 1001:0 /coverage USER 1001 RUN pip3 install --no-cache-dir social-auth-app-django gssapi coverage COPY /.coveragerc /Kiwi/.coveragerc -COPY ./kiwitcms_kerberos/ /venv/lib64/python3.11/site-packages/kiwitcms_kerberos/ -COPY ./kiwitcms_kerberos/kerberos_settings.py /venv/lib64/python3.11/site-packages/tcms_settings_dir/ +COPY ./kiwitcms_kerberos/ /venv/lib64/python3.12/site-packages/kiwitcms_kerberos/ +COPY ./kiwitcms_kerberos/kerberos_settings.py /venv/lib64/python3.12/site-packages/tcms_settings_dir/ # prepare DB during build b/c after turning on coverage this will be slow RUN /Kiwi/manage.py migrate && \ /Kiwi/manage.py createsuperuser --noinput --username super-root --email root@example.com -COPY ./sitecustomize.py /venv/lib/python3.11/site-packages/sitecustomize.py +COPY ./sitecustomize.py /venv/lib/python3.12/site-packages/sitecustomize.py From cdcfcf0ee6593e2d0a46a47fc6ab8841e8a5ef53 Mon Sep 17 00:00:00 2001 From: Alexander Todorov Date: Thu, 4 Jun 2026 13:34:29 +0300 Subject: [PATCH 3/3] Changelog for v0.3.2 --- README.rst | 8 ++++++++ setup.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/README.rst b/README.rst index c4b263b..667decf 100644 --- a/README.rst +++ b/README.rst @@ -97,6 +97,14 @@ or check out ``tests/Dockerfile.kerberos``. Changelog --------- +v0.3.2 (05 Jun 2026) +~~~~~~~~~~~~~~~~~~~~ + +- Update social-auth-core from 4.8.5 to 4.9.1 +- Update pre-commit.ci config +- Build and test with Python 3.12 + + v0.3.1 (17 Apr 2026) ~~~~~~~~~~~~~~~~~~~~ diff --git a/setup.py b/setup.py index e695498..8bc9db4 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ def get_long_description(): setup( name="social-auth-kerberos", - version="0.3.1", + version="0.3.2", description="Kerberos authentication backend for Python Social Auth", long_description=get_long_description(), author="Kiwi TCMS",