Skip to content
This repository has been archived by the owner on Jan 3, 2024. It is now read-only.

Update to py311 and remove cibuildwheel #228

Closed
wants to merge 5 commits into from
Closed
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 @@ -27,13 +27,13 @@ jobs:
matrix:
# Run all supported Python versions on linux
os: [ubuntu-latest]
python-version: ["3.8", "3.9", "3.10"]
python-version: ["3.9", "3.10", "3.11"]
# Include one windows, one macos run
include:
- os: macos-latest
python-version: "3.9"
python-version: "3.11"
- os: windows-latest
python-version: "3.9"
python-version: "3.11"

steps:
- name: Cache tensorflow model
Expand Down Expand Up @@ -64,10 +64,10 @@ jobs:
with:
repository: 'brainglobe/cellfinder'

- name: Set up Python 3.10
- name: Set up Python 3.11
uses: actions/setup-python@v3
with:
python-version: "3.10"
python-version: "3.11"

- name: Install test dependencies
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_include_guard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: '3.10'
python-version: '3.11'

- name: Install via pip
run: python -m pip install -e .
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_numba_off.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ jobs:
key: models-${{ hashFiles('~/.cellfinder/**') }}
- uses: neuroinformatics-unit/actions/test@v2
with:
python-version: "3.10"
python-version: "3.11"
codecov-flags: "numba"
10 changes: 2 additions & 8 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ classifiers = [
"Intended Audience :: Science/Research",
"Operating System :: OS Independent",
"Programming Language :: Python",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Topic :: Scientific/Engineering :: Image Recognition",
]
requires-python = ">=3.8"
Expand Down Expand Up @@ -71,12 +71,6 @@ include-package-data = true

[tool.setuptools_scm]

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

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

[tool.pytest.ini_options]
addopts = "--cov=cellfinder_core --cov-report=xml"
filterwarnings = [
Expand All @@ -94,7 +88,7 @@ markers = [
log_level = "WARNING"

[tool.black]
target-version = ['py38', 'py39', 'py310']
target-version = ['py39', 'py310', 'py311']
skip-string-normalization = false
line-length = 79

Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# For more information about tox, see https://tox.readthedocs.io/en/latest/
[tox]
envlist = py{38,39,310}
envlist = py{39,310,311}
isolated_build = true

[gh-actions]
python =
3.8: py38
3.9: py39
3.10: py310
3.11: py311

[testenv]
commands = python -m pytest -v --color=yes
Expand Down
Loading