Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/test/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ runs:
# with "python" and "pip" on the system Path
# (so that this custom Action can be used with both reproducible
# Pythons from Python docker images, and more frequently deprecated Pythons
# from - uses: actions/setup-python@v6)
# from - uses: actions/setup-python@v7)


- name: Checkout shapefiles and zip file artefacts repo
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ jobs:
steps:
- uses: actions/checkout@v6
- name: Set up Python
uses: actions/setup-python@v6
uses: actions/setup-python@v7
with:
python-version: '3.x'
python-version: '3.15'


- name: Download wheel and sdist (built in previous job)
Expand Down
46 changes: 29 additions & 17 deletions .github/workflows/run_checks_build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
with:
version: 0.13.6 # uv version
python-version: "3.14"
python-version: "3.15"

- name: uv Sync project, asserting locked with dev dependency group
run: uv sync --frozen --group lint
Expand All @@ -33,8 +33,8 @@ jobs:
- name: Install the latest version of uv and set the python version
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
with:
version: 0.11.15 # uv version
python-version: "3.14"
version: 0.13.6 # uv version
python-version: "3.15"

# use latest mypy version here, (even though pinned to 1.19.1 in lint group for Python 3.9 support)
- name: Run mypy --strict
Expand All @@ -45,9 +45,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- uses: actions/setup-python@v6
- uses: actions/setup-python@v7
with:
python-version: "3.13"
python-version: "3.15"
- name: Build wheel from the project repo
uses: ./.github/actions/build_wheel_and_sdist

Expand All @@ -57,28 +57,34 @@ jobs:
fail-fast: false
matrix:
python-version: [
"3.15",
"3.14",
"3.13",
"3.12",
"3.15-dev",
"3.15",
"3.11",
"3.10",
"3.9",
]
os: [
"ubuntu-24.04",
"ubuntu-latest",
]
include:
- python-version: "3.14"
exclude: # Don't just remove it from matrix in case we want
# to run Property tests on Windows or MacOS too.
- python-version: "3.9"
os: "ubuntu-latest"
- python-version: "3.14"

include:
- python-version: "3.15"
os: "windows-latest"
- python-version: "3.14"
- python-version: "3.15"
os: "macos-latest"
- python-version: "3.9"
os: "ubuntu-24.04"

runs-on: ${{ matrix.os }}
steps:
- uses: actions/setup-python@v6
- uses: actions/setup-python@v7
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -99,24 +105,30 @@ jobs:
fail-fast: false
matrix:
python-version: [
"3.15",
"3.14",
"3.13",
"3.12",
"3.15-dev",
"3.11",
"3.10",
"3.9",
]
os: [
"ubuntu-24.04",
"ubuntu-latest",
"windows-latest",
"macos-latest",
]
exclude:
- python-version: "3.9"
os: "ubuntu-latest"
include:
- python-version: "3.9"
os: "ubuntu-24.04"


runs-on: ${{ matrix.os }}
steps:
- uses: actions/setup-python@v6
- uses: actions/setup-python@v7
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -129,11 +141,11 @@ jobs:
with:
pyshp_repo_directory: ./Pyshp

- name: "Network tests (on Localhost ${{ !(matrix.os == 'ubuntu-24.04' && matrix.python-version == '3.14') }})"
- name: "Network tests (on Localhost ${{ !(matrix.os == 'ubuntu-latest' && matrix.python-version == '3.15') }})"
uses: ./Pyshp/.github/actions/test
with:
extra_args: '-m network'
replace_remote_urls_with_localhost: ${{ !(matrix.os == 'ubuntu-24.04' && matrix.python-version == '3.14') }}
replace_remote_urls_with_localhost: ${{ !(matrix.os == 'ubuntu-latest' && matrix.python-version == '3.15') }}
# Checkout to ./PyShp, as the test job also needs to check out the artefact repo
pyshp_repo_directory: ./Pyshp

14 changes: 10 additions & 4 deletions .github/workflows/speed_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- uses: actions/setup-python@v6
- uses: actions/setup-python@v7
- name: Build wheel from the project repo
uses: ./.github/actions/build_wheel_and_sdist

Expand All @@ -24,17 +24,23 @@ jobs:
matrix:
python-version: [
"3.9",
"3.14",
"3.15",
]
os: [
"ubuntu-latest",
"windows-latest",
"ubuntu-24.04",
]
exclude:
- python-version: "3.9"
os: "ubuntu-latest"
include:
- python-version: "3.9"
os: "ubuntu-24.04"


runs-on: ${{ matrix.os }}
steps:
- uses: actions/setup-python@v6
- uses: actions/setup-python@v7
with:
python-version: ${{ matrix.python-version }}

Expand Down
Loading