MAINT: Use bundle_tools_3 and fix various bugs

.github/workflows/build.yml

@@ -110,11 +110,6 @@ jobs:
           environment-file: environment.yml
           micromamba-version: latest
 
-      - name: Hotfix for NSIS
-        run: |
-          mamba install nsis=3.01 conda=4.12a "pydantic<2.0a0"
-        if: ${{ runner.os == 'Windows' }}
-
       - name: Extract version information
         env:
           MNE_CROSSCOMPILE_ARCH: ${{ matrix.arch }}
@@ -136,10 +131,6 @@ jobs:
           echo "MNE_INSTALLER_ARTIFACT_ID=${MNE_INSTALLER_ARTIFACT_ID}" >> $GITHUB_ENV
           echo "RECIPE_DIR=${RECIPE_DIR}" >> $GITHUB_ENV
 
-      - name: Patch constructor
-        run: |
-          ./tools/patch_constructor.sh
-
       - name: Add macOS M1 support
         if: ${{ matrix.arch == 'arm64' }}
         run: |

README.md

@@ -16,6 +16,6 @@ Locally, installers can be built using `tools/build_local.sh`. Steps:
    $ conda activate constructor-env
    ```
 2. If you want to build an arm64 (M1) package on a macOS Intel machine, run `source ./tools/setup_m1_crosscompile.sh`.
-3. Run `./tools/build_local.sh` (which will patch the constructor on macOS if needed).
+3. Run `./tools/build_local.sh`.
 4. Install the environment for your platform.
 5. Test it using the `tests/`.

assets/post_install_linux.sh

@@ -9,6 +9,7 @@ set -e
 echo "ℹ️ Fixing menu shortcuts."
 
 cd "$HOME/.local/share/applications"
+ls -alt *.desktop
 for f in ./MNE-Python*.desktop
 do
     sed -i "s/Terminal=True/Terminal=true/" $f

assets/post_install_macOS.sh

@@ -2,7 +2,7 @@
 
 # This script must be marked +x to work correctly with the installer!
 
-set -e
+set -eo pipefail
 
 logger -p 'install.info' "ℹ️ Running the custom MNE-Python post-install script."
 
@@ -15,30 +15,15 @@ logger -p 'install.info' "ℹ️ Running the custom MNE-Python post-install scri
 # Don't name the variable USER, as this one is already set.
 USER_FROM_HOMEDIR=`basename $HOME`
 
-logger -p 'install.info' "ℹ️ Fixing permissions of MNE .app bundles in ${HOME}/Applications: new owner will be ${USER_FROM_HOMEDIR}"
-chown -R $USER_FROM_HOMEDIR "${HOME}"/Applications/*\(MNE\).app
-
-logger -p 'install.info' "ℹ️ Moving MNE .app bundles from ${HOME}/Applications to /Applications/MNE-Python"
-mv "${HOME}"/Applications/*\(MNE\).app /Applications/MNE-Python/
-
-logger -p 'install.info' "ℹ️ Setting custom folder icon for /Applications/MNE-Python"
-osascript \
-    -e 'set DSTROOT to system attribute "DSTROOT"' \
-    -e 'set iconPath to DSTROOT & "/.mne-python/Menu/mne.png"' \
-    -e 'use framework "Foundation"' \
-    -e 'use framework "AppKit"' \
-    -e "set imageData to (current application's NSImage's alloc()'s initWithContentsOfFile:iconPath)" \
-    -e "(current application's NSWorkspace's sharedWorkspace()'s setIcon:imageData forFile:DSTROOT options: 0)"
-
 # Use Intel packages if the Python binary is x84_64, i.e. not native Apple Silicon
 # (This also applies to an Intel binary running on Apple Silicon through Rosetta)
 # https://conda-forge.org/docs/user/tipsandtricks.html#installing-apple-intel-packages-on-apple-silicon
-DSTBIN=${DSTROOT}/.mne-python/bin
+DSTBIN=${PREFIX}/bin
 PYTHON_PLATFORM=$(${DSTBIN}/conda run python -c "import platform; print(platform.machine())")
 PYSHORT=$($DSTBIN/conda run python -c "import sys; print('.'.join(map(str, sys.version_info[:2])))")
 if [ "${PYTHON_PLATFORM}" == "x86_64" ]; then
     logger -p 'install.info' "ℹ️ Configuring conda to only use Intel packages"
-    ${DSTROOT}/.mne-python/bin/conda env config vars set CONDA_SUBDIR=osx-64
+    ${PREFIX}/bin/conda env config vars set CONDA_SUBDIR=osx-64
 fi
 
 logger -p 'install.info' "ℹ️ Configuring Python to ignore user-installed local packages"
@@ -48,10 +33,10 @@ logger -p 'install.info' "ℹ️ Disabling mamba package manager banner"
 ${DSTBIN}/conda env config vars set MAMBA_NO_BANNER=1
 
 logger -p 'install.info' "ℹ️ Configuring Matplotlib to use the Qt backend by default"
-sed -i '.bak' "s/##backend: Agg/backend: qtagg/" ${DSTROOT}/.mne-python/lib/python${PYSHORT}/site-packages/matplotlib/mpl-data/matplotlibrc
+sed -i '.bak' "s/##backend: Agg/backend: qtagg/" ${PREFIX}/lib/python${PYSHORT}/site-packages/matplotlib/mpl-data/matplotlibrc
 
 logger -p 'install.info' "Fixing permissions of entire conda environment"
-chown -R $USER_FROM_HOMEDIR "${DSTROOT}/.mne-python"
+chown -R $USER_FROM_HOMEDIR "${PREFIX}"
 
 logger -p 'install.info' "Running mne sys_info"
 sudo -u $USER_FROM_HOMEDIR ${DSTBIN}/conda run mne sys_info || true

environment.yml

@@ -1,13 +1,12 @@
 name: constructor-env
 
 channels:
-  - napari/label/bundle_tools
+  - napari/label/bundle_tools_3
   - conda-forge
 
 dependencies:
-  - constructor =3.3a=*_21
-  - conda-standalone =4.12a=*_9
-  - menuinst =2.0a=14_g594d642_*
-  - conda =4.12a
-  - mamba =1.1.0
-  - pydantic <2.0a0
+  - constructor
+  - conda-standalone
+  - menuinst
+  - conda
+  - mamba

recipes/mne-python_1.4/construct.yaml

@@ -4,6 +4,7 @@ company: MNE-Python Developers
 # When the version above changes to a new major/minor, it needs to be updated
 # many places here, and in assets/current_version.txt.
 
+# https://github.com/conda/constructor/blob/main/CONSTRUCT.md
 license_file: ../../assets/license.txt         # [linux]
 license_file: ../../assets/license.rtf         # [not linux]
 welcome_image: ../../assets/welcome_macOS.png  # [osx]
@@ -12,16 +13,19 @@ header_image: ../../assets/header.png
 icon_image: ../../assets/icon.png
 welcome_file: ../../assets/welcome.rtf
 readme_text: ""
-conclusion_file: ../../assets/conclusion.rtf
+conclusion_file: ../../assets/conclusion.rtf  # [not win]
 
 initialize_by_default: False
 register_python_default: False
 
-# default_prefix will be ignored by macOS .pkg installer!
 default_prefix: ${HOME}/mne-python/1.4.2_0                          # [linux]
 default_prefix: "%USERPROFILE%\\mne-python\\1.4.2_0"                # [win]
 default_prefix_domain_user: "%LOCALAPPDATA%\\mne-python\\1.4.2_0"   # [win]
 default_prefix_all_users: "%ALLUSERSPROFILE%\\mne-python\\1.4.2_0"  # [win]
+# shortcuts will be created in Appplications automatically, so use Library here
+default_location_pkg: "Library"                                     # [osx]
+pkg_name: "MNE-Python"                                              # [osx]
+progress_notifications: true                                        # [osx]
 
 uninstall_name: MNE-Python ${VERSION} (Python ${PYVERSION})
 

tools/build_local.sh

@@ -10,5 +10,4 @@ echo "OS:           ${MACHINE}"
 echo "Machine:      ${PYMACHINE}"
 echo "PLATFORM_ARG: ${PLATFORM_ARG}"
 echo "EXE_ARG:      ${EXE_ARG}"
-${SCRIPT_DIR}/patch_constructor.sh
 ${SCRIPT_DIR}/run_constructor.sh