From dfe180c925fa8d21744b063d95ddbd61b328706d Mon Sep 17 00:00:00 2001 From: Alexander Todorov Date: Wed, 3 Jun 2026 15:35:18 +0300 Subject: [PATCH 1/3] Remove obsolete Travis CI config file --- .travis.yml | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 4af15eb..0000000 --- a/.travis.yml +++ /dev/null @@ -1,30 +0,0 @@ -dist: bionic -sudo: required -language: python -python: - - "3.6" -cache: pip -env: - - MAKE=flake8 - - MAKE=pylint - - MAKE=test-codecov - - MAKE=build - -matrix: - include: - - python: 3.7 - env: MAKE=test-codecov - - - python: 3.8 - env: MAKE=test-codecov - -install: - - pip install -r devel.txt - -script: - - make $MAKE - -notifications: - email: - on_failure: change - on_success: never From 4c74788a963003ec061d1a179414dfaedf301071 Mon Sep 17 00:00:00 2001 From: Alexander Todorov Date: Wed, 3 Jun 2026 15:42:12 +0300 Subject: [PATCH 2/3] Drop hard-coded dependency on setuptools_scm==6.0.1 --- appveyor.yml | 2 +- tests/check-build | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 09b40ad..379eca8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -25,7 +25,7 @@ install: - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;C:\\Users\\appveyor\\AppData\\Roaming\\Python\\Python311\\Scripts;C:\\cygwin64\\bin;%PATH%" - "python --version" - - "python -m pip install --upgrade setuptools setuptools_scm==6.0.1 " + - "python -m pip install --upgrade setuptools" - "python -m pip install --disable-pip-version-check --user --upgrade pip wheel" - "python -m pip install -r devel.txt" diff --git a/tests/check-build b/tests/check-build index c3c9d5a..52e3fa0 100755 --- a/tests/check-build +++ b/tests/check-build @@ -44,7 +44,6 @@ set -e echo "..... Trying to install the new tarball inside a virtualenv" virtualenv -q -p $(which python) .venv/test-tarball source .venv/test-tarball/bin/activate -#pip install --upgrade setuptools setuptools_scm==6.0.1 pip pip install --no-binary :all: gssapi pip install --no-binary :all: dist/tcms_api*.tar.gz pip freeze | grep tcms-api @@ -54,7 +53,6 @@ rm -rf .venv/ echo "..... Trying to install the new wheel inside a virtualenv" virtualenv -q -p $(which python) .venv/test-wheel source .venv/test-wheel/bin/activate -#pip install --upgrade setuptools setuptools_scm==6.0.1 pip pip install gssapi pip install --only-binary :all: dist/tcms_api*.whl pip freeze | grep tcms-api From 9b7ea5c37641f4f99f90eca7844ab2aedf0470b9 Mon Sep 17 00:00:00 2001 From: Alexander Todorov Date: Wed, 3 Jun 2026 15:35:01 +0300 Subject: [PATCH 3/3] Test with Python 3.12 --- .github/workflows/integration.yml | 2 +- appveyor.yml | 4 ++-- setup.py | 4 +--- tests/krb5/Dockerfile.kiwitcms | 8 ++++---- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index cd9a53d..e54d9b6 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -20,7 +20,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] gssapi: [with, without] steps: diff --git a/appveyor.yml b/appveyor.yml index 379eca8..1a9f5dd 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,7 +4,7 @@ image: environment: global: - PYTHON: "C:\\Python311-x64" + PYTHON: "C:\\Python312-x64" matrix: - MAKE: flake8 @@ -22,7 +22,7 @@ install: # Prepend Python to the PATH of this build (this cannot be done from inside # the powershell script as it would require to restart the parent CMD process). # cygwin64\bin contains all commands used by 'make build' - - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;C:\\Users\\appveyor\\AppData\\Roaming\\Python\\Python311\\Scripts;C:\\cygwin64\\bin;%PATH%" + - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;C:\\Users\\appveyor\\AppData\\Roaming\\Python\\Python312\\Scripts;C:\\cygwin64\\bin;%PATH%" - "python --version" - "python -m pip install --upgrade setuptools" diff --git a/setup.py b/setup.py index f31ed7a..d0ecb4d 100644 --- a/setup.py +++ b/setup.py @@ -56,9 +56,7 @@ def get_install_requires(path): + " or later (LGPLv2+)", "Operating System :: POSIX", "Programming Language :: Python", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "Topic :: Software Development", "Topic :: Software Development :: Libraries :: Python Modules", "Topic :: Software Development :: Quality Assurance", diff --git a/tests/krb5/Dockerfile.kiwitcms b/tests/krb5/Dockerfile.kiwitcms index e783dfe..63d5f73 100644 --- a/tests/krb5/Dockerfile.kiwitcms +++ b/tests/krb5/Dockerfile.kiwitcms @@ -1,12 +1,12 @@ FROM kiwitcms/kiwi USER 0 -RUN microdnf -y --nodocs install gcc krb5-devel python3.11-devel && \ - microdnf clean all +RUN dnf -y --nodocs install gcc krb5-devel python3.12-devel && \ + dnf clean all USER 1001 RUN pip3 install --no-cache-dir -U kiwitcms RUN pip3 install --no-cache-dir social-auth-app-django social-auth-kerberos -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/