diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index ada8fb64..f15b87bb 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -170,7 +170,7 @@ jobs: fi - - uses: actions/upload-artifact@v5 + - uses: actions/upload-artifact@v6 if: always() with: name: asv-benchmark-results-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}-${{ matrix.benchmark-name }} @@ -182,13 +182,13 @@ jobs: if: always() steps: - name: Download artifact - uses: actions/download-artifact@v6 + uses: actions/download-artifact@v7 with: pattern: asv-benchmark-results* path: asv_result merge-multiple: true - name: Upload artifact - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v6 with: name: asv-benchmark-results-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }} path: asv_result diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3c55bdff..f3a49a69 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,7 +21,7 @@ jobs: steps: - name: Download built artifact to dist/ - uses: actions/download-artifact@v6 + uses: actions/download-artifact@v7 with: name: Packages path: dist diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c81ae17b..4674b81c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -66,7 +66,7 @@ jobs: - name: Archive figures generated during testing if: always() - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v6 with: name: plotting-results-${{ matrix.python-version }}-${{ matrix.platform }} path: /Users/runner/work/napari-spatialdata/napari-spatialdata/tests/plots/generated/* diff --git a/src/napari_spatialdata/_widgets.py b/src/napari_spatialdata/_widgets.py index d4f130bf..9be7b1cf 100644 --- a/src/napari_spatialdata/_widgets.py +++ b/src/napari_spatialdata/_widgets.py @@ -24,13 +24,14 @@ from vispy import scene from vispy.color.colormap import Colormap, MatplotlibColormap from vispy.scene.widgets import ColorBarWidget + # See https://github.com/scverse/squidpy/issues/1061 for more details. # Scanpy 0.11.x-0.12.x renamed set_default_colors_for_categorical_obs to _set_default_colors_for_categorical_obs # and then changed it back. Try underscore version first, fall back to non-underscore. try: from scanpy.plotting._utils import _set_default_colors_for_categorical_obs as set_default_colors_for_categorical_obs except ImportError: - from scanpy.plotting._utils import set_default_colors_for_categorical_obs + pass # See https://github.com/scverse/squidpy/issues/1061 for more details. # Scanpy 0.11.x-0.12.x renamed set_default_colors_for_categorical_obs to _set_default_colors_for_categorical_obs