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.

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

Update supported Python versions and remove cibuildwheel config #117

Merged
merged 1 commit into from
Jun 5, 2024
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
10 changes: 5 additions & 5 deletions .github/workflows/test_and_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,16 @@ jobs:
fail-fast: false
matrix:
# Run tests on ubuntu across all supported versions
python-version: ["3.9", "3.10"]
python-version: ["3.10", "3.11", "3.12"]
os: [ubuntu-latest]
# Include a Windows test and old/new Mac runs
include:
- os: macos-13
python-version: "3.10"
python-version: "3.12"
- os: macos-latest
python-version: "3.10"
python-version: "3.12"
- os: windows-latest
python-version: "3.10"
python-version: "3.12"
steps:
# Cache atlases
- name: Cache brainglobe directory
Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:

strategy:
matrix:
python-version: ["3.10"]
python-version: ["3.12"]

steps:
- name: Checkout brainglobe-workflows repository
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/asv.latest-github.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
// The Pythons you'd like to test against. If not provided, defaults
// to the current version of Python used to run `asv`.
"pythons": [
"3.10"
"3.12"
],
// The list of conda channel names to be searched for benchmark
// dependency packages in the specified order
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/asv.pip.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
// The Pythons you'd like to test against. If not provided, defaults
// to the current version of Python used to run `asv`.
"pythons": [
"3.10"
"3.12"
],
// The list of conda channel names to be searched for benchmark
// dependency packages in the specified order
Expand Down
19 changes: 8 additions & 11 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ authors = [
description = "A collection of end-to-end data analysis workflows executed using BrainGlobe tools."
readme = "README.md"
license = { file = "LICENSE" }
requires-python = ">=3.9"
requires-python = ">=3.10"
dynamic = ["version"]

classifiers = [
Expand All @@ -19,7 +19,8 @@ classifiers = [
"License :: OSI Approved :: BSD License",
"Operating System :: OS Independent",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python",
"Topic :: Scientific/Engineering :: Image Recognition",
]
Expand Down Expand Up @@ -84,17 +85,11 @@ include = ["brainglobe_workflows"]
exclude = ["tests", "resources", "benchmarks"]

[tool.black]
target-version = ["py39", "py310"]
target-version = ["py310", "py311", 'py312']
skip-string-normalization = false
line-length = 79
ignore = ["*.yaml"]

[tool.cibuildwheel]
build = "cp39-* cp310-*"

[tool.cibuildwheel.macos]
archs = ["x86_64", "arm64"]

[tool.check-manifest]

[tool.pytest.ini_options]
Expand All @@ -119,13 +114,15 @@ fix = true
[tool.tox]
legacy_tox_ini = """
[tox]
envlist = py{39,310}-{coredev}
envlist = py{310,311,312}-{coredev}
isolated_build = True

[gh-actions]
python =
3.9: py39
3.10: py310
3.11: py311
3.12: py312


[gh-actions:env]
# This runs the coredev environment if the "coredev" github actions input
Expand Down
Loading