Skip to content

Commit

Permalink
Merge branch 'develop' into dependabot/github_actions/develop/actions…
Browse files Browse the repository at this point in the history
…/setup-python-5
  • Loading branch information
Czaki authored Dec 18, 2023
2 parents 00fb97e + 7ef0b01 commit 2f6858d
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/base_test_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
pip list
- name: Test with tox
uses: aganders3/headless-gui@v1
uses: aganders3/headless-gui@v2
timeout-minutes: ${{ inputs.timeout }}
with:
run: python -m tox ${{ inputs.tox_args }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/semgrep.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:

steps:
# Fetch project source with GitHub Actions Checkout.
- uses: actions/checkout@v3
- uses: actions/checkout@v4
# Run the "semgrep ci" command on the command line of the docker image.
- run: semgrep ci
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_napari_repo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:

- name: Test with tox
# run tests using pip install --pre
uses: aganders3/headless-gui@v1
uses: aganders3/headless-gui@v2
timeout-minutes: 60
with:
run: tox
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test_prereleases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
- name: Test with tox linux
# run tests using pip install --pre
uses: aganders3/headless-gui@v1
uses: aganders3/headless-gui@v2
timeout-minutes: 60
with:
run: python -m tox -v --pre
Expand Down Expand Up @@ -127,7 +127,7 @@ jobs:
name: bundle
path: dist2/
- name: Test bundle
uses: aganders3/headless-gui@v1
uses: aganders3/headless-gui@v2
timeout-minutes: 60
with:
run: dist/PartSeg/PartSeg _test
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ jobs:
run: sed -e "s/{sys_platform}/{platform}/g" tox.ini -i

- name: Test with tox
uses: aganders3/headless-gui@v1
uses: aganders3/headless-gui@v2
with:
run: conda run -n test --no-capture-output tox -e py39-PySide2-conda
timeout-minutes: 60
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ default_language_version:

repos:
- repo: https://github.com/psf/black-pre-commit-mirror
rev: 23.10.1
rev: 23.11.0
hooks:
- id: black
pass_filenames: true
Expand All @@ -25,7 +25,7 @@ repos:
- id: setup-cfg-fmt
args: ["--include-version-classifiers", "--max-py-version", "3.11"]
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.1.3
rev: v0.1.7
hooks:
- id: ruff
- repo: https://github.com/asottile/pyupgrade
Expand All @@ -49,7 +49,7 @@ repos:
- mdformat-toc

- repo: https://github.com/pre-commit/mirrors-mypy
rev: 'v1.6.1' # Use the sha / tag you want to point at
rev: 'v1.7.1' # Use the sha / tag you want to point at
hooks:
- id: mypy
files: ^package/PartSegImage/.+\.py
Expand Down

0 comments on commit 2f6858d

Please sign in to comment.