diff --git a/.github/workflows/base_test_workflow.yml b/.github/workflows/base_test_workflow.yml index 4cd71bbbd..d1dc1ead9 100644 --- a/.github/workflows/base_test_workflow.yml +++ b/.github/workflows/base_test_workflow.yml @@ -54,7 +54,7 @@ jobs: runs-on: ${{ inputs.os }} steps: - uses: actions/checkout@v5 - - uses: actions/setup-python@v5 + - uses: actions/setup-python@v6 name: Install Python ${{ inputs.python_version }} with: python-version: ${{ inputs.python_version }} diff --git a/.github/workflows/make_release.yml b/.github/workflows/make_release.yml index 065888466..c4266b9bc 100644 --- a/.github/workflows/make_release.yml +++ b/.github/workflows/make_release.yml @@ -32,7 +32,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v5 - - uses: actions/setup-python@v5 + - uses: actions/setup-python@v6 with: python-version: "3.12" - uses: tlambert03/setup-qt-libs@v1 diff --git a/.github/workflows/test_napari_repo.yml b/.github/workflows/test_napari_repo.yml index c1f4f707b..814be7e57 100644 --- a/.github/workflows/test_napari_repo.yml +++ b/.github/workflows/test_napari_repo.yml @@ -40,7 +40,7 @@ jobs: - uses: actions/checkout@v5 - name: Set up Python ${{ matrix.python }} - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: ${{ matrix.python }} diff --git a/.github/workflows/test_prereleases.yml b/.github/workflows/test_prereleases.yml index 04e5b0651..5c27072ec 100644 --- a/.github/workflows/test_prereleases.yml +++ b/.github/workflows/test_prereleases.yml @@ -55,7 +55,7 @@ jobs: - uses: actions/checkout@v5 - name: Set up Python ${{ matrix.python }} - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: ${{ matrix.python }} cache: 'pip' @@ -124,7 +124,7 @@ jobs: runs-on: "ubuntu-latest" steps: - uses: actions/checkout@v5 - - uses: actions/setup-python@v5 + - uses: actions/setup-python@v6 name: Install Python with: python-version: 3.x diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f1f48774e..f7bba0fd4 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -153,7 +153,7 @@ jobs: needs: [test_coverage, test_minimal] steps: - uses: actions/checkout@v5 - - uses: actions/setup-python@v5 + - uses: actions/setup-python@v6 with: python-version: "3.x" cache-dependency-path: pyproject.toml diff --git a/.github/workflows/upgrade-dependencies.yml b/.github/workflows/upgrade-dependencies.yml index 95c236970..198d5cd82 100644 --- a/.github/workflows/upgrade-dependencies.yml +++ b/.github/workflows/upgrade-dependencies.yml @@ -23,7 +23,7 @@ jobs: # START PYTHON DEPENDENCIES - - uses: actions/setup-python@v5 + - uses: actions/setup-python@v6 with: python-version: "3.12" cache: pip diff --git a/launcher.spec b/launcher.spec index 56fd8ba2f..a01cf8d36 100644 --- a/launcher.spec +++ b/launcher.spec @@ -43,8 +43,11 @@ if napari_version <= parse_version("0.4.16"): return Path(qt_resources.__file__).parent / f"{key}.py" else: def import_resources(): + from napari.utils import theme from napari import resources + del theme + return os.path.join(os.path.dirname(resources.__file__), "icons") import contextlib