Skip to content

Commit

Permalink
Merge branch 'main' into category-registration
Browse files Browse the repository at this point in the history
  • Loading branch information
DragaDoncila authored Sep 11, 2024
2 parents 85d1d45 + 2b5f7b2 commit 5430fd0
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
10 changes: 6 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,12 @@ jobs:
coverage run --source=npe2 -m pytest --color yes
- name: Upload coverage as artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: coverage reports
name: coverage reports ${{ matrix.platform }} py ${{ matrix.python-version }} ${{ (matrix.pydantic == 'pydantic<2' && 'pydantic_lt_2') || 'pydantic_gt_2' }}
path: |
./.coverage.*
include-hidden-files: true

test_napari:
name: napari tests
Expand Down Expand Up @@ -124,10 +125,11 @@ jobs:
pip install codecov
- name: Download coverage data
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: coverage reports
pattern: coverage reports*
path: coverage
merge-multiple: true

- name: combine coverage data
run: |
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 @@ -13,7 +13,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: "✏️ Generate release changelog"
uses: heinrichreimer/github-changelog-generator-action@v2.3
uses: heinrichreimer/github-changelog-generator-action@v2.4
with:
futureRelease: ${{ github.event.inputs.next_tag }}
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion src/npe2/_plugin_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ def disable(self, plugin_name: PluginName) -> None:

self._disabled_plugins.add(plugin_name)
self._contrib.remove_contributions(plugin_name)
self._command_menu_map.pop(plugin_name)
self._command_menu_map.pop(plugin_name, None)
self.events.enablement_changed({}, {plugin_name})

def is_disabled(self, plugin_name: str) -> bool:
Expand Down

0 comments on commit 5430fd0

Please sign in to comment.