Drop changes needed for 0.4.18 and update a few other things (#85)

* Revert temporary changes done for 0.4.18 release * add napari-plugin-manager * move to python 3.9 on Windows
napari · Feb 1, 2024 · f55c769 · f55c769
1 parent aed2845
commit f55c769
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 57 deletions.
diff --git a/.github/workflows/make_bundle_conda.yml b/.github/workflows/make_bundle_conda.yml
@@ -201,13 +201,11 @@ jobs:
             },
             {
               "os": "windows-latest",
-              "python-version": "3.8",
+              "python-version": "3.9",
               "target-platform": "win-64",
             },
           ]
-          # TEMPORARY for 0.4.18 only
-          # platforms_str = "${{ inputs.installer_platforms || 'linux-64,win-64,osx-64,osx-arm64' }}"
-          platforms_str = 'linux-64,win-64,osx-64,osx-arm64'
+          platforms_str = "${{ inputs.installer_platforms || 'linux-64,win-64,osx-64,osx-arm64' }}"
           platforms = {p.strip() for p in platforms_str.split(",")}
 
           matrix = {"include": []}

diff --git a/build_installers.py b/build_installers.py
@@ -227,6 +227,7 @@ def _napari_env(
             f"python={python_version}.*=*_cpython",
             f"napari={napari_version}",
             f"napari-menu={napari_version}",
+            "napari-plugin-manager",
             f"pyside2={pyside_version}",
             "conda",
             "mamba",

diff --git a/conda-recipe/conda_menu_config.json b/conda-recipe/conda_menu_config.json
diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
@@ -125,9 +125,7 @@ outputs:
       number: {{ build }}
       script:
         - mkdir -p "${PREFIX}/Menu"
-        # - sed "s/__PKG_VERSION__/{{ PKG_VERSION }}/" "{{ SRC_DIR }}/resources/conda_menu_config.json" > "{{ PREFIX }}/Menu/napari-menu.json"
-        # TEMPORARY, revert after 0.4.18
-        - sed "s/__PKG_VERSION__/{{ PKG_VERSION }}/" "{{ RECIPE_DIR }}/conda_menu_config.json" > "{{ PREFIX }}/Menu/napari-menu.json"
+        - sed "s/__PKG_VERSION__/{{ PKG_VERSION }}/" "{{ SRC_DIR }}/resources/conda_menu_config.json" > "{{ PREFIX }}/Menu/napari-menu.json"
         - cp "{{ SRC_DIR }}/napari/resources/logo.png" "{{ PREFIX }}/Menu/napari.png"
         - cp "{{ SRC_DIR }}/napari/resources/icon.icns" "{{ PREFIX }}/Menu/napari.icns"
         - cp "{{ SRC_DIR }}/napari/resources/icon.ico" "{{ PREFIX }}/Menu/napari.ico"