From cd4800bdb762dd120ecdd6597fb2740b140a5fd8 Mon Sep 17 00:00:00 2001 From: Michael Szell Date: Tue, 13 Oct 2026 16:47:25 +0200 Subject: [PATCH] Update Python to 3.12-3.15, and actions --- .github/workflows/docs.yml | 10 +++++----- .github/workflows/publish.yml | 2 +- .github/workflows/test.yml | 12 ++++++------ .pre-commit-config.yaml | 11 ++++++++--- environment-dev.yml | 2 +- environment.yml | 2 +- pyproject.toml | 5 ++--- 7 files changed, 24 insertions(+), 20 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 5335d57..91c9783 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -28,7 +28,7 @@ jobs: generate-deploy-docs: strategy: matrix: - python-version: ["3.14"] + python-version: ["3.12"] os: [ubuntu-latest] name: Generate documentation runs-on: ${{ matrix.os }} @@ -42,7 +42,7 @@ 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 @@ -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 846833a..9accb38 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -22,7 +22,7 @@ jobs: url: https://pypi.org/project/linkbikenet/ 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 c575f23..eb17e41 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,7 +21,7 @@ jobs: caching: strategy: matrix: - python-version: ["3.10", "3.14"] + python-version: ["3.12", "3.15"] os: [ ubuntu-latest ] fail-fast: false env: @@ -31,10 +31,10 @@ 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@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.10", "3.14"] + python-version: ["3.12", "3.15"] os: [ ubuntu-latest ] submodule: - { name: "linkbikenet", pytest_args: "tests/test_linkbikenet.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/LinkBikeNet \ No newline at end of file diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 99fa2c2..50e720e 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/environment-dev.yml b/environment-dev.yml index e13befe..ab79ea8 100644 --- a/environment-dev.yml +++ b/environment-dev.yml @@ -2,7 +2,7 @@ name: lbnenvdev channels: - conda-forge dependencies: - - python>=3.10 + - python>=3.12 - osmnx>=2 - scipy - geojson diff --git a/environment.yml b/environment.yml index be210e3..3c8b657 100644 --- a/environment.yml +++ b/environment.yml @@ -2,7 +2,7 @@ name: lbnenv channels: - conda-forge dependencies: - - python>=3.10 + - python>=3.12 - osmnx>=2 - scipy - geojson diff --git a/pyproject.toml b/pyproject.toml index 36bcef2..9aa9d09 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,15 +24,14 @@ classifiers = [ "Operating System :: OS Independent", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3 :: Only", - "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", "Natural Language :: English", "Topic :: Scientific/Engineering :: GIS", ] -requires-python = ">=3.10" +requires-python = ">=3.12" dependencies = [ "geopandas>=1", "osmnx>=2",