Skip to content

Commit

Permalink
[MAINT] Add python 3.11 to test matrix (#198)
Browse files Browse the repository at this point in the history
Adding python 3.11 to test matrix, which has experimental support in
napari.
Note that pyside2 doesn't have any current wheels for python 3.11, so
had to split pyqt and pyside testing to not run pyside2 with python 3.11
Also had to bump the black version to support python 3.11
  • Loading branch information
GenevieveBuckley authored Jan 15, 2024
2 parents 921f872 + 8cd485e commit 8ac1211
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test_and_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
strategy:
matrix:
platform: [ ubuntu-latest, windows-latest, macos-latest ]
python-version: [ "3.8", "3.9", "3.10" ]
python-version: [ "3.8", "3.9", "3.10", "3.11" ]

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ repos:
- id: isort
exclude: _vendor|vendored|examples
- repo: https://github.com/python/black
rev: 22.3.0
rev: 23.12.1
hooks:
- id: black
pass_filenames: true
Expand Down
1 change: 0 additions & 1 deletion napari_animation/_qt/animation_widget.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,6 @@ def _on_slider_moved(self, event=None):
self.animation.set_movie_frame_index(frame_index)

def _save_callback(self, event=None):

saveDialogWidget = SaveDialogWidget(self)
animation_kwargs = saveDialogWidget.getAnimationParameters(
self, "Save animation", str(Path.home())
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ build-backend = "setuptools.build_meta"


[tool.black]
target-version = ['py36', 'py37', 'py38']
target-version = ['py38', 'py39', 'py310', 'py311']
line-length = 79
exclude = '''
(
Expand Down
13 changes: 10 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
# For more information about tox, see https://tox.readthedocs.io/en/latest/
[tox]
envlist = py{38,39,310}-{linux,macos,windows}-{pyqt,pyside}
envlist = py{38,39,310,311}-{linux,macos,windows}-pyqt, py{38,39,310}-{linux,macos,windows}-pyside

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

[gh-actions:env]
PLATFORM =
Expand Down Expand Up @@ -36,10 +37,16 @@ deps =
pytest-cov # https://pytest-cov.readthedocs.io/en/latest/
pytest-qt # https://pytest-qt.readthedocs.io/en/latest/intro.html
pytest-xvfb ; sys_platform == 'linux'
pyqt: napari[pyqt5,testing]
pyside: napari[pyside2,testing]
commands = pytest -v --color=yes --cov=napari_animation --cov-report=xml

[testenv:py{38,39,310,311}-{linux,macos,windows}-pyqt]
deps =
napari[pyqt5,testing]

[testenv:py{38,39,310}-{linux,macos,windows}-pyside]
deps =
napari[pyside2,testing]

[testenv:isort]
skip_install = True
deps = pre-commit
Expand Down

0 comments on commit 8ac1211

Please sign in to comment.