Skip to content

Commit

Permalink
Update Python versions to adhere to SPEC 0 and remove Intel testing o…
Browse files Browse the repository at this point in the history
…n macOS (#233)

* Update Python versions to adhere to SPEC 0 and remove Intel testing on macOS

* Fix mistake

* Update .github/workflows/test_and_deploy.yml

Co-authored-by: Igor Tatarnikov <[email protected]>

---------

Co-authored-by: Igor Tatarnikov <[email protected]>
  • Loading branch information
adamltyson and IgorTatarnikov authored Feb 28, 2025
1 parent d0e8f58 commit d434fcc
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 13 deletions.
15 changes: 7 additions & 8 deletions .github/workflows/test_and_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,13 @@ jobs:
strategy:
fail-fast: false
matrix:
# Run across a mixture of Python versions and operating systems
# Run all supported Python versions on linux
os: [ ubuntu-latest ]
python-version: [ "3.11", "3.12", "3.13" ]
include:
- os: ubuntu-latest
python-version: "3.12"
- os: macos-13 # just intel mac here, silicon mac tested with mamba due to niftyreg complications
python-version: "3.11"
- os: windows-latest
python-version: "3.10"
# silicon mac tested with mamba due to niftyreg complications
- os: windows-latest
python-version: "3.13"

steps:
- name: Cache brainglobe directory
Expand Down Expand Up @@ -90,7 +89,7 @@ jobs:
init-shell: bash
environment-name: niftyreg-env
create-args: >-
python=3.12
python=3.13
setuptools
setuptools_scm
wheel
Expand Down
10 changes: 5 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ classifiers = [
"Intended Audience :: Science/Research",
"Operating System :: OS Independent",
"Programming Language :: Python",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Framework :: napari",
]
requires-python = ">=3.10"
requires-python = ">=3.11"
dependencies = [
"brainglobe-atlasapi>=2.0.1",
"brainglobe-space>=1.0.0",
Expand Down Expand Up @@ -87,7 +87,7 @@ addopts = "--cov=brainreg"
[tool.black]
line-length = 79
skip-string-normalization = false
target-version = ['py310','py311', 'py312']
target-version = ['py311','py312', 'py313']

[tool.ruff]
line-length = 79
Expand All @@ -98,14 +98,14 @@ fix = true
[tool.tox]
legacy_tox_ini = """
[tox]
envlist = py{310,311,312}
envlist = py{311,312,313}
isolated_build = True
[gh-actions]
python =
3.10: py310
3.11: py311
3.12: py312
3.13: py313
[testenv]
extras =
Expand Down

0 comments on commit d434fcc

Please sign in to comment.