From fc6b86b3b35fd783ba3d73b4b31da3c9b2c33102 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Tue, 10 Nov 2026 17:36:19 +0200 Subject: [PATCH 1/3] Refactor tox.ini to de-duplicate --- tox.ini | 137 +++----------------------------------------------------- 1 file changed, 5 insertions(+), 132 deletions(-) diff --git a/tox.ini b/tox.ini index 54aaeeb..781279a 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,9 @@ # and then run "tox" from this directory. [tox] -envlist = py{27, 38, 39, 310, 311, 312, 313, 314, py, 27gpg2, 38gpg2, 39gpg2, 310gpg2, 311gpg2, 312gpg2, 313gpg2, 314gpg2, pygpg2} +envlist = + py{27, 38, 39, 310, 311, 312, 313, 314, py} + py{27, 38, 39, 310, 311, 312, 313, 314, py}-gpg2 isolated_build = True requires = virtualenv<20.22.0 @@ -13,139 +15,10 @@ commands = {envpython} test_gnupg.py setenv = NO_EXTERNAL_TESTS=1 + gpg2: LD_LIBRARY_PATH=/home/vinay/tmp/lib + gpg2: GPGBINARY=gpg2 passenv = HOME ENABLE_TOFU STATIC_TEST_HOMEDIR - -deps = - - -[testenv:py27gpg2] -envdir = {toxinidir}/.tox/py27 -basepython = python2.7 -setenv = - LD_LIBRARY_PATH=/home/vinay/tmp/lib - GPGBINARY=gpg2 - NO_EXTERNAL_TESTS=1 - -passenv = - HOME - ENABLE_TOFU - -[testenv:py36gpg2] -envdir = {toxinidir}/.tox/py36 -basepython = python3.6 -setenv = - LD_LIBRARY_PATH=/home/vinay/tmp/lib - GPGBINARY=gpg2 - NO_EXTERNAL_TESTS=1 - -passenv = - HOME - ENABLE_TOFU - -[testenv:py37gpg2] -envdir = {toxinidir}/.tox/py37 -basepython = python3.7 -setenv = - LD_LIBRARY_PATH=/home/vinay/tmp/lib - GPGBINARY=gpg2 - NO_EXTERNAL_TESTS=1 - -passenv = - HOME - ENABLE_TOFU - -[testenv:py38gpg2] -envdir = {toxinidir}/.tox/py38 -basepython = python3.8 -setenv = - LD_LIBRARY_PATH=/home/vinay/tmp/lib - GPGBINARY=gpg2 - NO_EXTERNAL_TESTS=1 - -passenv = - HOME - ENABLE_TOFU - -[testenv:py39gpg2] -envdir = {toxinidir}/.tox/py39 -basepython = python3.9 -setenv = - LD_LIBRARY_PATH=/home/vinay/tmp/lib - GPGBINARY=gpg2 - NO_EXTERNAL_TESTS=1 - -passenv = - HOME - ENABLE_TOFU - -[testenv:py310gpg2] -envdir = {toxinidir}/.tox/py310 -basepython = python3.10 -setenv = - LD_LIBRARY_PATH=/home/vinay/tmp/lib - GPGBINARY=gpg2 - NO_EXTERNAL_TESTS=1 - -passenv = - HOME - ENABLE_TOFU - -[testenv:py311gpg2] -envdir = {toxinidir}/.tox/py311 -basepython = python3.11 -setenv = - LD_LIBRARY_PATH=/home/vinay/tmp/lib - GPGBINARY=gpg2 - NO_EXTERNAL_TESTS=1 - -passenv = - HOME - ENABLE_TOFU - -[testenv:py312gpg2] -envdir = {toxinidir}/.tox/py312 -basepython = python3.12 -setenv = - LD_LIBRARY_PATH=/home/vinay/tmp/lib - GPGBINARY=gpg2 - NO_EXTERNAL_TESTS=1 - -[testenv:py313gpg2] -envdir = {toxinidir}/.tox/py313 -basepython = python3.13 -setenv = - LD_LIBRARY_PATH=/home/vinay/tmp/lib - GPGBINARY=gpg2 - NO_EXTERNAL_TESTS=1 - -passenv = - HOME - ENABLE_TOFU - -[testenv:py314gpg2] -envdir = {toxinidir}/.tox/py314 -basepython = python3.14 -setenv = - LD_LIBRARY_PATH=/home/vinay/tmp/lib - GPGBINARY=gpg2 - NO_EXTERNAL_TESTS=1 - -passenv = - HOME - ENABLE_TOFU - -[testenv:pypygpg2] -envdir = {toxinidir}/.tox/pypy -basepython = pypy -setenv = - LD_LIBRARY_PATH=/home/vinay/tmp/lib - GPGBINARY=gpg2 - NO_EXTERNAL_TESTS=1 - -passenv = - HOME - ENABLE_TOFU From 6bc0beb9b76185dca72e236b6e14dd60329301af Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Tue, 10 Nov 2026 17:38:25 +0200 Subject: [PATCH 2/3] Add support for Python 3.15 --- .github/workflows/python-package.yml | 2 +- setup.cfg | 1 + tox.ini | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index c0aa828..769027e 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -35,7 +35,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest, windows-latest] - python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.13t', '3.14', '3.14t', 'pypy-3.9'] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.13t', '3.14', '3.14t', '3.15', '3.15t', 'pypy-3.9'] steps: - uses: actions/checkout@v6 diff --git a/setup.cfg b/setup.cfg index 93e4155..551741e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -45,6 +45,7 @@ classifiers = Programming Language :: Python :: 3.12 Programming Language :: Python :: 3.13 Programming Language :: Python :: 3.14 + Programming Language :: Python :: 3.15 Operating System :: OS Independent Topic :: Software Development :: Libraries :: Python Modules project_urls = diff --git a/tox.ini b/tox.ini index 781279a..7e9b1a2 100644 --- a/tox.ini +++ b/tox.ini @@ -5,8 +5,8 @@ [tox] envlist = - py{27, 38, 39, 310, 311, 312, 313, 314, py} - py{27, 38, 39, 310, 311, 312, 313, 314, py}-gpg2 + py{27, 38, 39, 310, 311, 312, 313, 314, 315, py} + py{27, 38, 39, 310, 311, 312, 313, 314, 315, py}-gpg2 isolated_build = True requires = virtualenv<20.22.0 From 57a7232b1d9d342e2ddb50955095b5f398f659f5 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Tue, 10 Nov 2026 17:53:06 +0200 Subject: [PATCH 3/3] Bump GitHub Actions --- .github/workflows/python-package.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 769027e..9b219f6 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -38,9 +38,9 @@ jobs: python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.13t', '3.14', '3.14t', '3.15', '3.15t', 'pypy-3.9'] steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v6 + uses: actions/setup-python@v7 with: python-version: ${{ matrix.python-version }} - name: Install Windows-only dependencies @@ -68,7 +68,7 @@ jobs: env: NO_EXTERNAL_TESTS: 1 - name: Upload coverage to Codecov - uses: codecov/codecov-action@v5 + uses: codecov/codecov-action@v7 with: flags: unittests files: coverage.xml