diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index 0a99b4d..cc5f42e 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -27,16 +27,16 @@ jobs: strategy: matrix: # Run all supported Python versions on linux - python-version: ["3.9", "3.10", "3.11"] os: [ubuntu-latest] - # Include one windows and macos run + python-version: ["3.10", "3.11", "3.12"] + # Include one windows and two macOS (intel based and arm based) runs include: - - os: macos-13 # Intel Mac - python-version: "3.10" - - os: macos-latest # ARM Mac - python-version: "3.10" - - os: windows-latest - python-version: "3.10" + - os: macos-13 + python-version: "3.12" + - os: macos-latest + python-version: "3.12" + - os: windows-latest + python-version: "3.12" steps: - name: Cache brainglobe directory diff --git a/brainglobe_heatmap/planner.py b/brainglobe_heatmap/planner.py index 100ebdf..242d73f 100644 --- a/brainglobe_heatmap/planner.py +++ b/brainglobe_heatmap/planner.py @@ -91,13 +91,16 @@ def show(self): (self.slicer.plane0, self.slicer.plane1), (blue_dark, pink_dark), (0.8, 0.3), + strict=False, ): plane_mesh = plane.to_mesh(self.scene.root) plane_mesh.alpha(alpha).color(color) self.scene.add(plane_mesh, transform=False) for vector, v_color in zip( - (plane.normal, plane.u, plane.v), (color, red_dark, green_dark) + (plane.normal, plane.u, plane.v), + (color, red_dark, green_dark), + strict=False, ): self.scene.add( Arrow( diff --git a/pyproject.toml b/pyproject.toml index b5816fc..bba3d71 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,7 @@ name = "brainglobe-heatmap" authors = [{ name = "Federico Claudi", email = "hello@brainglobe.info" }] description = "Rendering anatomical heatmaps with brainrender and matplotlib" readme = "README.md" -requires-python = ">=3.9.0" +requires-python = ">=3.10" dynamic = ["version"] dependencies = ["brainrender", "matplotlib", "numpy", "myterial", "rich"] @@ -14,9 +14,9 @@ classifiers = [ "Development Status :: 2 - Pre-Alpha", "Programming Language :: Python", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "Operating System :: OS Independent", "License :: OSI Approved :: MIT License", ] @@ -57,7 +57,7 @@ exclude = ["tests*"] addopts = "--cov=brainglobe_heatmap" [tool.black] -target-version = ['py39', 'py310', 'py311'] +target-version = ['py310','py311', 'py312'] skip-string-normalization = false line-length = 79 @@ -83,14 +83,14 @@ select = ["I", "E", "F", "B"] [tool.tox] legacy_tox_ini = """ [tox] -envlist = py{39,310,311} +envlist = py{310,311,312} isolated_build = True [gh-actions] python = - 3.9: py39 3.10: py310 3.11: py311 + 3.12: py312 [testenv] extras =