Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update supported python versions #46

Merged
merged 2 commits into from
Jun 5, 2024
Merged

Update supported python versions #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5970a0
Update supported python versions
adamltyson Jun 5, 2024
2e2df90
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 5, 2024
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
16 changes: 8 additions & 8 deletions .github/workflows/test_and_deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion brainglobe_heatmap/planner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
10 changes: 5 additions & 5 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand All @@ -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",
]
Expand Down Expand Up @@ -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

Expand All @@ -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 =
Expand Down
Loading