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

Commit

Permalink
Fix tests (#149)
Browse files Browse the repository at this point in the history
* Fix tox file

* Fix scikit-image dep

* Update pre-commit versions

* Don't fail fast

* Test with xvfb

* Use NI actions
  • Loading branch information
dstansby committed Feb 3, 2023
1 parent a390f8f commit 11e4c8a
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 8 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/test_and_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ jobs:
name: ${{ matrix.os }} py${{ matrix.python-version }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
# Run all supported Python versions on linux
python-version: ["3.8", "3.9", "3.10"]
Expand All @@ -37,9 +38,10 @@ jobs:
# Setup pyqt libraries
- uses: tlambert03/setup-qt-libs@v1
# Run tests
- uses: brainglobe/actions/test@v1
- uses: neuroinformatics-unit/actions/test@v1
with:
python-version: ${{ matrix.python-version }}
use-xvfb: true

deploy:
# this will run when you have tagged a commit, starting with "v*"
Expand Down
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
repos:
- repo: https://github.com/pycqa/isort
rev: 5.10.1
rev: 5.12.0
hooks:
- id: isort
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0
rev: v4.4.0
hooks:
- id: check-docstring-first
- id: check-executables-have-shebangs
Expand All @@ -19,10 +19,10 @@ repos:
# not inferfere with versioning
exclude: setup.cfg
- repo: https://github.com/pycqa/flake8
rev: 5.0.4
rev: 6.0.0
hooks:
- id: flake8
- repo: https://github.com/psf/black
rev: 22.10.0
rev: 22.12.0
hooks:
- id: black
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"magicgui",
"numpy",
"qtpy",
"skimage",
"scikit-image",
"tifffile",
"pooch>=1", # For downloading sample data
]
Expand Down
7 changes: 5 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
# For more information about tox, see https://tox.readthedocs.io/en/latest/
[tox]
envlist = py{38,39}
envlist = py{38,39,310,311}

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

[testenv]
passenv =
CI
GITHUB_ACTIONS
DISPLAY XAUTHORITY
DISPLAY
XAUTHORITY
NUMPY_EXPERIMENTAL_ARRAY_FUNCTION
PYVISTA_OFF_SCREEN
deps =
Expand Down

0 comments on commit 11e4c8a

Please sign in to comment.