From de38760bd90fa6f6c65d806cd2e947ffd8eef9df Mon Sep 17 00:00:00 2001 From: Michael Szell Date: Sun, 11 Oct 2026 09:20:20 +0200 Subject: [PATCH 1/3] Update Python and actions versions --- .github/workflows/docs.yml | 10 +++++----- .github/workflows/publish.yml | 2 +- .github/workflows/test.yml | 10 +++++----- .pre-commit-config.yaml | 11 ++++++++--- pyproject.toml | 9 +++++---- 5 files changed, 24 insertions(+), 18 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 9b61aab..8137b02 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -42,13 +42,13 @@ jobs: shell: bash -el {0} steps: - name: Check out Git repository - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Get week number run: echo "WEEK=$(date +'%V')" >> $GITHUB_ENV - name: Set up Python ${{ matrix.python-version }} - uses: mamba-org/setup-micromamba@v2 + uses: mamba-org/setup-micromamba@v3 with: create-args: python=${{ matrix.python-version }} environment-file: environment-dev.yml @@ -64,12 +64,12 @@ jobs: run: sphinx-build docs/source/ public -b dirhtml - name: Setup Pages - uses: actions/configure-pages@v5 + uses: actions/configure-pages@v6 - name: Upload artifact - uses: actions/upload-pages-artifact@v4 + uses: actions/upload-pages-artifact@v5 with: # Upload generated html path: "public/" - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v4 + uses: actions/deploy-pages@v5 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index bc972dd..150fae9 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -22,7 +22,7 @@ jobs: url: https://pypi.org/project/fixbikenet/ steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - name: Build package run: | diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6bdb67a..f01d8f9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,7 +21,7 @@ jobs: caching: strategy: matrix: - python-version: ["3.12", "3.14"] + python-version: ["3.12", "3.15"] os: [ ubuntu-latest ] fail-fast: false env: @@ -34,7 +34,7 @@ jobs: name: Cache for ${{ matrix.python-version }} on ${{ matrix.os }} runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - name: Get week number run: echo "WEEK=$(date +'%V')" >> $GITHUB_ENV @@ -51,7 +51,7 @@ jobs: needs: caching strategy: matrix: - python-version: ["3.12", "3.14"] + python-version: ["3.12", "3.15"] os: [ ubuntu-latest ] submodule: - { name: "Main", pytest_args: "tests/test_main.py" } @@ -66,7 +66,7 @@ jobs: shell: bash -el {0} steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - name: Get week number run: echo "WEEK=$(date +'%V')" >> $GITHUB_ENV @@ -87,7 +87,7 @@ jobs: pytest ${{ matrix.submodule.pytest_args }} --cov --cov-branch --cov-report=xml - name: Upload results to Codecov - uses: codecov/codecov-action@v5 + uses: codecov/codecov-action@v7 with: token: ${{ secrets.CODECOV_TOKEN }} slug: BikeNetKit/FixBikeNet \ No newline at end of file diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5333bdd..deecab9 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -16,14 +16,19 @@ repos: - id: mixed-line-ending - id: check-illegal-windows-names - - repo: https://github.com/pre-commit/mirrors-prettier - rev: "v3.1.0" + - repo: local # https://github.com/prettier/prettier/discussions/16227#discussioncomment-18456780 hooks: - id: prettier + name: prettier + entry: prettier + args: [--write, --ignore-unknown] + language: node types_or: [markdown, yaml] + additional_dependencies: + - prettier@3.9.10 - repo: https://github.com/astral-sh/ruff-pre-commit # Ruff version. - rev: v0.16.7 + rev: v0.17.0 hooks: # Run the linter. - id: ruff-check diff --git a/pyproject.toml b/pyproject.toml index 61959b9..b7f12cd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,12 +6,12 @@ build-backend = "setuptools.build_meta" name = "fixbikenet" version = "0.8.2" authors = [ - {name = "Manuel Knepper"}, - {name = "Anastassia Vybornova"}, - {name = "Michael Szell", email = "michael@szell.net"}, + { name = "Michael Szell", email = "michael@szell.net" }, + { name = "Manuel Knepper" }, + { name = "Anastassia Vybornova" }, ] maintainers = [ - {name = "Michael Szell", email = "michael@szell.net"}, + { name = "Michael Szell", email = "michael@szell.net" }, ] license = "AGPL-3.0-or-later" readme = "README.md" @@ -28,6 +28,7 @@ classifiers = [ "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.13", "Programming Language :: Python :: 3.14", + "Programming Language :: Python :: 3.15", "Natural Language :: English", "Topic :: Scientific/Engineering :: GIS", ] From ce91722d6ec578c7d573a20ca3fd1ed671c993e7 Mon Sep 17 00:00:00 2001 From: Michael Szell Date: Sun, 11 Oct 2026 09:23:32 +0200 Subject: [PATCH 2/3] Rename tests --- .github/workflows/test.yml | 4 ++-- tests/{test_main.py => test_fixbikenet.py} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename tests/{test_main.py => test_fixbikenet.py} (100%) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f01d8f9..7eb3e1e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -54,8 +54,8 @@ jobs: python-version: ["3.12", "3.15"] os: [ ubuntu-latest ] submodule: - - { name: "Main", pytest_args: "tests/test_main.py" } - - { name: "Functions", pytest_args: "tests/test_functions.py" } + - { name: "fixbikenet", pytest_args: "tests/test_fixbikenet.py" } + - { name: "functions", pytest_args: "tests/test_functions.py" } fail-fast: false name: ${{ matrix.submodule.name }} (${{ matrix.python-version }} on ${{ matrix.os }}) diff --git a/tests/test_main.py b/tests/test_fixbikenet.py similarity index 100% rename from tests/test_main.py rename to tests/test_fixbikenet.py From aba56e8c5fda64b8fd6c7ee6b95abb19fe1f8e92 Mon Sep 17 00:00:00 2001 From: Michael Szell Date: Sun, 11 Oct 2026 09:26:10 +0200 Subject: [PATCH 3/3] Make cache naming consistent --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7eb3e1e..d0b99e7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -31,7 +31,7 @@ jobs: run: shell: bash -elo pipefail {0} - name: Cache for ${{ matrix.python-version }} on ${{ matrix.os }} + name: cache (${{ matrix.python-version }} on ${{ matrix.os }}) runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v7