From 187a96e452a7e5bbee16bb3c06441d9f81b2a8f8 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Thu, 23 Oct 2025 17:20:30 +0200 Subject: [PATCH 1/6] CI: rename linux -> ci_job contains windows now in the job's matrix, soon also macOS. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 22eff55..09830a7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ on: - '!docs/**' jobs: - linux: + ci_job: strategy: fail-fast: true From 1827857e158b3d7e6f7d4b1f5e2488a4a6a54d1d Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Thu, 23 Oct 2025 17:22:42 +0200 Subject: [PATCH 2/6] CI: add macOS based testing --- .github/workflows/ci.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 09830a7..7db5a99 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,6 +52,9 @@ jobs: - os: ubuntu-24.04 python-version: '3.13' toxenv: py313 + - os: macos-latest + python-version: '3.12' + toxenv: py312 - os: windows-latest python-version: '3.12' toxenv: py312 @@ -142,6 +145,9 @@ jobs: - name: Install borgstore (no extras) if: runner.os == 'Windows' run: pip install -ve . + - name: Install borgstore (no extras) + if: runner.os == 'macOS' + run: pip install -ve . - name: run tox envs (Linux) if: runner.os == 'Linux' run: | @@ -149,4 +155,7 @@ jobs: - name: run tox envs (Windows) if: runner.os == 'Windows' run: tox -e ${{ matrix.toxenv }} + - name: run tox envs (macOS) + if: runner.os == 'macOS' + run: tox -e ${{ matrix.toxenv }} From 41273df05e11b862c3edda1593e6a95125edfccf Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Thu, 23 Oct 2025 17:25:02 +0200 Subject: [PATCH 3/6] CI: cosmetic changes --- .github/workflows/ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7db5a99..7196279 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -150,12 +150,10 @@ jobs: run: pip install -ve . - name: run tox envs (Linux) if: runner.os == 'Linux' - run: | - tox -e all_extras + run: tox -e all_extras - name: run tox envs (Windows) if: runner.os == 'Windows' run: tox -e ${{ matrix.toxenv }} - name: run tox envs (macOS) if: runner.os == 'macOS' run: tox -e ${{ matrix.toxenv }} - From 02dd5630e473546b89c6d88849a7ab98b860c4d6 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Thu, 23 Oct 2025 17:26:21 +0200 Subject: [PATCH 4/6] CI: 3.12 is tested on macOS remove py312 testing on Linux --- .github/workflows/ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7196279..0e73292 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,9 +46,6 @@ jobs: - os: ubuntu-24.04 python-version: '3.11' toxenv: py311 - - os: ubuntu-24.04 - python-version: '3.12' - toxenv: py312 - os: ubuntu-24.04 python-version: '3.13' toxenv: py313 From 8178e3d9eeb2506a7da50768dac1b211f7d73d44 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Thu, 23 Oct 2025 17:28:01 +0200 Subject: [PATCH 5/6] CI: use py311 for windows testing so that we can compare to py311 on Linux. --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0e73292..255a036 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,8 +53,8 @@ jobs: python-version: '3.12' toxenv: py312 - os: windows-latest - python-version: '3.12' - toxenv: py312 + python-version: '3.11' + toxenv: py311 allow-failure: true env: From c5815cb36326583c66866c38f09dc3ba376b5418 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Thu, 23 Oct 2025 17:29:02 +0200 Subject: [PATCH 6/6] CI: add py314 testing on ubuntu-latest --- .github/workflows/ci.yml | 3 +++ pyproject.toml | 1 + tox.ini | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 255a036..1f89fe6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,6 +49,9 @@ jobs: - os: ubuntu-24.04 python-version: '3.13' toxenv: py313 + - os: ubuntu-latest + python-version: '3.14' + toxenv: py314 - os: macos-latest python-version: '3.12' toxenv: py312 diff --git a/pyproject.toml b/pyproject.toml index a48e175..69b0aa3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,6 +16,7 @@ classifiers = [ "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.13", + "Programming Language :: Python :: 3.14", "Topic :: Software Development :: Libraries", "Topic :: Software Development :: Libraries :: Python Modules", ] diff --git a/tox.ini b/tox.ini index c25dded..d05e9ee 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ # tox configuration - if you change anything here, run this to verify: tox --recreate [tox] -envlist = py{39,310,311,312,313},flake8,mypy +envlist = py{39,310,311,312,313,314},flake8,mypy [testenv] deps = pytest