Skip to content

Commit

Permalink
Merge branch 'main' into pre-commit-ci-update-config
Browse files Browse the repository at this point in the history
  • Loading branch information
jni authored Jun 21, 2024
2 parents 4749c3e + 490131a commit 36da522
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 13 deletions.
5 changes: 5 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,8 @@ updates:
interval: "weekly"
commit-message:
prefix: "ci(dependabot):"

groups:
github-actions:
patterns:
- "actions/*"
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand Down Expand Up @@ -70,7 +70,7 @@ jobs:
path: napari-from-github
fetch-depth: 0

- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: "3.10"
- name: Install
Expand All @@ -90,7 +90,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: "3.x"
- name: Build schema
Expand All @@ -110,9 +110,9 @@ jobs:
if: always()
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: "3.x"
cache-dependency-path: setup.cfg
Expand All @@ -138,7 +138,7 @@ jobs:
python -Im coverage report --format=markdown --skip-empty --skip-covered >> $GITHUB_STEP_SUMMARY
- name: Upload coverage data
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
fail_ci_if_error: true
token: ${{ secrets.CODECOV_TOKEN }}
Expand All @@ -155,7 +155,7 @@ jobs:
- uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.x"

Expand All @@ -180,7 +180,7 @@ jobs:
TWINE_USERNAME: __token__
TWINE_PASSWORD: ${{ secrets.TWINE_API_KEY }}

- uses: softprops/action-gh-release@v1
- uses: softprops/action-gh-release@v2
if: startsWith(github.ref, 'refs/tags/')
with:
generate_release_notes: true
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test_conversion.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:

steps:
- uses: tlambert03/setup-qt-libs@v1
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: 3.9

Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:

- name: Test Conversion
id: test-without-napari
uses: aganders3/headless-gui@v1
uses: aganders3/headless-gui@v2
continue-on-error: true
with:
run: npe2 convert ./plugin_repo
Expand All @@ -73,13 +73,13 @@ jobs:
- name: Test Conversion again with napari
id: test-with-napari
if: ${{ steps.test-without-napari.outcome == 'failure' }}
uses: aganders3/headless-gui@v1
uses: aganders3/headless-gui@v2
with:
run: npe2 convert ./plugin_repo

- name: Test Conversion again with napari
if: ${{ steps.test-without-napari.outcome == 'failure' && steps.test-with-napari.outcome == 'failure' }}
uses: aganders3/headless-gui@v1
uses: aganders3/headless-gui@v2
with:
# try without modifying directory
run: npe2 convert -n ${{ matrix.plugin }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update_changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}
repo: napari/npe2
- name: Create Pull Request
uses: peter-evans/create-pull-request@v5
uses: peter-evans/create-pull-request@v6
with:
token: ${{ secrets.GITHUB_TOKEN }}
commit-message: Automatic changelog update
Expand Down

0 comments on commit 36da522

Please sign in to comment.