Merge branch 'main' into pre-commit-ci-update-config

Author: psobolewskiPhD

build_installers.py

@@ -128,7 +128,12 @@ def _version():
             # and git hash;  so we discard the date
             pre, post = version.split("+", 1)
             version = f"{pre}+{post.split('.')[0]}"
-        if ".dev" in version and "rc" not in version:
+        if (
+            ".dev" in version
+            and "rc" not in version
+            and "a" not in version
+            and "b" not in version
+        ):
             # workaround for https://github.com/conda/conda/issues/12568
             version = version.replace(".dev", "dev")
         return version
@@ -323,7 +328,7 @@ def _definitions(version=_version(), extra_specs=None, napari_repo=HERE):
                 "welcome_image": os.path.join(resources, "napari_164x314.png"),
                 "header_image": os.path.join(resources, "napari_150x57.png"),
                 "icon_image": os.path.join(
-                    napari_repo, "napari", "resources", "icon.ico"
+                    napari_repo, "src", "napari", "resources", "icon.ico"
                 ),
                 "register_python": False,
                 "register_python_default": False,

conda-recipe/meta.yaml

@@ -105,8 +105,8 @@ outputs:
       license: BSD-3-Clause AND MIT
       license_file:
         - LICENSE
-        - napari/_vendor/darkdetect/LICENSE
-        - napari/_vendor/qt_json_builder/LICENSE
+        - src/napari/_vendor/darkdetect/LICENSE
+        - src/napari/_vendor/qt_json_builder/LICENSE
       summary: a fast n-dimensional image viewer in Python, with only the required dependencies
       doc_url: http://napari.org
       dev_url: https://github.com/napari/napari
@@ -146,9 +146,9 @@ outputs:
       script:
         - mkdir -p "${PREFIX}/Menu"
         - 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"
+        - cp "{{ SRC_DIR }}/src/napari/resources/logo.png" "{{ PREFIX }}/Menu/napari.png"
+        - cp "{{ SRC_DIR }}/src/napari/resources/icon.icns" "{{ PREFIX }}/Menu/napari.icns"
+        - cp "{{ SRC_DIR }}/src/napari/resources/icon.ico" "{{ PREFIX }}/Menu/napari.ico"
     requirements:
       build:
         - sed     # [unix]