From 78309b952fcee69d5d697fa9ff53ae52c21ce492 Mon Sep 17 00:00:00 2001 From: Daniel Mohns Date: Mon, 5 Jan 2026 16:33:27 +0100 Subject: [PATCH 01/14] Remove license classifier in favor of a SPDX license --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index cd73f49..91784a7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,7 +18,6 @@ authors = [ classifiers = [ "Development Status :: 5 - Production/Stable", "Intended Audience :: Developers", - "License :: OSI Approved :: Apache Software License", "Operating System :: Unix", "Operating System :: POSIX", "Operating System :: MacOS", From 1a479606d46e3baf70c609a6fe5591c94e227111 Mon Sep 17 00:00:00 2001 From: Daniel Mohns Date: Mon, 5 Jan 2026 16:40:15 +0100 Subject: [PATCH 02/14] Remove deprecated way of defining license --- pyproject.toml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 91784a7..d29c72a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools>=61.0"] +requires = ["setuptools>=77.0"] build-backend = "setuptools.build_meta" [project] @@ -8,7 +8,8 @@ version = "0.6.0" description = "OpenPAYGO Python library" readme = { file = "README.md", content-type = "text/markdown" } requires-python = ">=3.6" -license = { text = "MIT License" } +license = "MIT" +license-files = ["LICEN[CS]E*"] keywords = ["paygo"] authors = [ From 2627d32a1c0bb8f73c7123041724899e2a296a69 Mon Sep 17 00:00:00 2001 From: Daniel Mohns Date: Mon, 5 Jan 2026 16:43:47 +0100 Subject: [PATCH 03/14] Update URL's --- pyproject.toml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index d29c72a..c6ffadb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -45,11 +45,12 @@ dev = [ ] [project.urls] -Homepage = "https://enaccess.github.io/OpenPAYGO-docs/" -Documentation = "https://enaccess.github.io/OpenPAYGO-docs/" -Changes = "https://github.com/EnAccess/OpenPAYGO-python/releases" -Source = "https://github.com/EnAccess/OpenPAYGO-python/" -Issues = "https://github.com/EnAccess/OpenPAYGO-python/issues" +homepage = "https://enaccess.github.io/OpenPAYGO-docs/" +source = "https://github.com/EnAccess/OpenPAYGO-python/" +changelog = "https://github.com/EnAccess/OpenPAYGO-python/releases" +releasenotes = "https://github.com/EnAccess/OpenPAYGO-python/releases" +documentation = "https://enaccess.github.io/OpenPAYGO-docs/" +issues = "https://github.com/EnAccess/OpenPAYGO-python/issues" [tool.setuptools] include-package-data = true From a60eb7b9718cb138cd828f153fbbf775fda7d2a6 Mon Sep 17 00:00:00 2001 From: Daniel Mohns Date: Mon, 5 Jan 2026 16:46:05 +0100 Subject: [PATCH 04/14] Support more Python versions --- .github/workflows/check.yaml | 6 ++++++ pyproject.toml | 3 +++ 2 files changed, 9 insertions(+) diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index 7aa60c6..9442a49 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -36,9 +36,15 @@ jobs: strategy: matrix: python-version: + - "3.6" + - "3.7" + - "3.8" + - "3.9" - "3.10" - "3.11" - "3.12" + - "3.13" + - "3.14" steps: - uses: actions/checkout@v5 diff --git a/pyproject.toml b/pyproject.toml index c6ffadb..4648711 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,12 +25,15 @@ classifiers = [ "Operating System :: Microsoft :: Windows", "Programming Language :: Python", "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", + "Programming Language :: Python :: 3.14", "Programming Language :: Python :: Implementation :: CPython", "Topic :: Utilities", ] From 141fa4de5f19e8cc3eb8519c729bf4dc1f8c13be Mon Sep 17 00:00:00 2001 From: Daniel Mohns Date: Mon, 5 Jan 2026 16:51:09 +0100 Subject: [PATCH 05/14] Update `pyproject.toml` --- pyproject.toml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 4648711..49bc66a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,14 +6,17 @@ build-backend = "setuptools.build_meta" name = "openpaygo" version = "0.6.0" description = "OpenPAYGO Python library" -readme = { file = "README.md", content-type = "text/markdown" } -requires-python = ">=3.6" +readme = "README.md" license = "MIT" license-files = ["LICEN[CS]E*"] -keywords = ["paygo"] authors = [ - { name = "EnAccess" } + { name = "EnAccess", email = "info@enaccess.org" } +] + +keywords = [ + "paygo", + "open-paygo" ] classifiers = [ @@ -38,6 +41,8 @@ classifiers = [ "Topic :: Utilities", ] +requires-python = ">=3.6" + dependencies = [ "siphash>=0.0.1", ] From dc5fbf60114195bfbfa8f5679ccb9031bcf62045 Mon Sep 17 00:00:00 2001 From: Daniel Mohns Date: Mon, 5 Jan 2026 16:57:01 +0100 Subject: [PATCH 06/14] Install Python using Github Actions not `uv` --- .github/workflows/check.yaml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index 9442a49..20f53ed 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -49,13 +49,16 @@ jobs: steps: - uses: actions/checkout@v5 - - name: Install uv - uses: astral-sh/setup-uv@v7 + - name: Set up Python + uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} - - name: Set up Python - run: uv python install + - name: Install uv + uses: astral-sh/setup-uv@v7 + + - name: Check Python version in uv + run: uv run python --version - name: Install dependencies run: uv sync From 6b406d72e42e7a1fd587395eb1b06fbad1f4e375 Mon Sep 17 00:00:00 2001 From: Daniel Mohns Date: Mon, 5 Jan 2026 17:11:03 +0100 Subject: [PATCH 07/14] Run old Python on old Ubuntu --- .github/workflows/check.yaml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index 20f53ed..84905c6 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -32,12 +32,11 @@ jobs: pytest: name: Run pytest - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} strategy: matrix: + # Modern Python → ubuntu-latest python-version: - - "3.6" - - "3.7" - "3.8" - "3.9" - "3.10" @@ -45,6 +44,14 @@ jobs: - "3.12" - "3.13" - "3.14" + os: + - ubuntu-latest + # Old Python → only available on older Ubuntu + include: + - python-version: "3.6" + os: ubuntu-22.04 + - python-version: "3.7" + os: ubuntu-20.04 steps: - uses: actions/checkout@v5 From 448434db1d6573cdb27a4d8d164407687ca6ab8a Mon Sep 17 00:00:00 2001 From: Daniel Mohns Date: Mon, 5 Jan 2026 17:15:51 +0100 Subject: [PATCH 08/14] Fix switcheroo --- .github/workflows/check.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index 84905c6..7b8170f 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -49,9 +49,9 @@ jobs: # Old Python → only available on older Ubuntu include: - python-version: "3.6" - os: ubuntu-22.04 - - python-version: "3.7" os: ubuntu-20.04 + - python-version: "3.7" + os: ubuntu-22.04 steps: - uses: actions/checkout@v5 From 93906d44d6e4c50e7b30badbfe64664e8e12fc7e Mon Sep 17 00:00:00 2001 From: Daniel Mohns Date: Mon, 5 Jan 2026 17:24:36 +0100 Subject: [PATCH 09/14] Fix `setuptools` --- pyproject.toml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 49bc66a..704d112 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,8 @@ [build-system] -requires = ["setuptools>=77.0"] +requires = [ + "setuptools>=77.0; python_version >= 3.9", + "setuptools; python_version < '3.9'", +] build-backend = "setuptools.build_meta" [project] From d0096a9ff8eeaf13dd338853b1f367713655d4f8 Mon Sep 17 00:00:00 2001 From: Daniel Mohns Date: Mon, 5 Jan 2026 17:25:29 +0100 Subject: [PATCH 10/14] Fix conditionals --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 704d112..0e7dd72 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [build-system] requires = [ - "setuptools>=77.0; python_version >= 3.9", + "setuptools>=77.0; python_version >= '3.9'", "setuptools; python_version < '3.9'", ] build-backend = "setuptools.build_meta" From 9b7e954d20d908bb07003fb8179c1434998b4634 Mon Sep 17 00:00:00 2001 From: Daniel Mohns Date: Mon, 5 Jan 2026 17:32:18 +0100 Subject: [PATCH 11/14] Drop support for EoL Python versions --- .github/workflows/check.yaml | 11 ++--------- pyproject.toml | 11 +++-------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index 7b8170f..5a9dddd 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -32,26 +32,19 @@ jobs: pytest: name: Run pytest - runs-on: ${{ matrix.os }} + runs-on: ubuntu-latest strategy: matrix: - # Modern Python → ubuntu-latest python-version: - - "3.8" - "3.9" - "3.10" - "3.11" - "3.12" - "3.13" - "3.14" + - "3.15" os: - ubuntu-latest - # Old Python → only available on older Ubuntu - include: - - python-version: "3.6" - os: ubuntu-20.04 - - python-version: "3.7" - os: ubuntu-22.04 steps: - uses: actions/checkout@v5 diff --git a/pyproject.toml b/pyproject.toml index 0e7dd72..1251214 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,8 +1,5 @@ [build-system] -requires = [ - "setuptools>=77.0; python_version >= '3.9'", - "setuptools; python_version < '3.9'", -] +requires = ["setuptools >= 77.0.3"] build-backend = "setuptools.build_meta" [project] @@ -31,20 +28,18 @@ classifiers = [ "Operating System :: Microsoft :: Windows", "Programming Language :: Python", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.6", - "Programming Language :: Python :: 3.7", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.13", "Programming Language :: Python :: 3.14", + "Programming Language :: Python :: 3.15", "Programming Language :: Python :: Implementation :: CPython", "Topic :: Utilities", ] -requires-python = ">=3.6" +requires-python = ">=3.9" dependencies = [ "siphash>=0.0.1", From 0ba087ccf77bab82556537a7727173bb8e867f7d Mon Sep 17 00:00:00 2001 From: Daniel Mohns Date: Mon, 5 Jan 2026 17:33:59 +0100 Subject: [PATCH 12/14] Revert CI --- .github/workflows/check.yaml | 8 ++++---- pyproject.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index 5a9dddd..01e9b7e 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -49,13 +49,13 @@ jobs: steps: - uses: actions/checkout@v5 - - name: Set up Python - uses: actions/setup-python@v6 + - name: Install uv + uses: astral-sh/setup-uv@v7 with: python-version: ${{ matrix.python-version }} - - name: Install uv - uses: astral-sh/setup-uv@v7 + - name: Set up Python + uses: actions/setup-python@v6 - name: Check Python version in uv run: uv run python --version diff --git a/pyproject.toml b/pyproject.toml index 1251214..3acdc8f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools >= 77.0.3"] +requires = ["setuptools>=77.0.3"] build-backend = "setuptools.build_meta" [project] From 7ce058c5ec05f179c94907260663db953dd40e9b Mon Sep 17 00:00:00 2001 From: Daniel Mohns Date: Mon, 5 Jan 2026 17:34:20 +0100 Subject: [PATCH 13/14] Revert left over --- .github/workflows/check.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index 01e9b7e..6e81968 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -43,8 +43,6 @@ jobs: - "3.13" - "3.14" - "3.15" - os: - - ubuntu-latest steps: - uses: actions/checkout@v5 From 72d3e14466fae70f1a004ecfe6d3d604c46501ee Mon Sep 17 00:00:00 2001 From: Daniel Mohns Date: Mon, 5 Jan 2026 17:34:51 +0100 Subject: [PATCH 14/14] Revert left over --- .github/workflows/check.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index 6e81968..9011664 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -53,7 +53,7 @@ jobs: python-version: ${{ matrix.python-version }} - name: Set up Python - uses: actions/setup-python@v6 + run: uv python install - name: Check Python version in uv run: uv run python --version