diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 05f788ae..837128aa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -129,9 +129,12 @@ jobs: test "$MNE_INSTALLER_NAME" != "" echo "Artifact ID: ${MNE_INSTALLER_ARTIFACT_ID}" test "$MNE_INSTALLER_ARTIFACT_ID" != "" + echo "Prefix: ${MNE_INSTALL_PREFIX}" + test "$MNE_INSTALL_PREFIX" != "" echo "MNE_INSTALLER_VERSION=${MNE_INSTALLER_VERSION}" >> $GITHUB_ENV echo "MNE_INSTALLER_NAME=${MNE_INSTALLER_NAME}" >> $GITHUB_ENV echo "MNE_INSTALLER_ARTIFACT_ID=${MNE_INSTALLER_ARTIFACT_ID}" >> $GITHUB_ENV + echo "MNE_INSTALL_PREFIX=${MNE_INSTALL_PREFIX}" >> $GITHUB_ENV echo "RECIPE_DIR=${RECIPE_DIR}" >> $GITHUB_ENV echo "CONDA_SOLVER=libmamba" >> $GITHUB_ENV if [[ "$MNE_CROSSCOMPILE_ARCH" == "arm64" ]]; then @@ -153,15 +156,21 @@ jobs: ./tools/run_constructor.sh - name: Check installer signature (macOS) - if: ${{ runner.os == 'macOS' && github.event_name != 'pull_request' }} + if: ${{ runner.os == 'macOS' }} run: | # Installer package set -eo pipefail - pkgutil --check-signature ${MNE_INSTALLER_NAME} + if [[ "${{ github.event_name }}" != "pull_request" ]]; then + pkgutil --check-signature ${MNE_INSTALLER_NAME} || exit 1 + fi # Now extract the package and check that the conda.exe binary is # properly signed as well pkgutil --expand-full ${MNE_INSTALLER_NAME} ./mne-extracted - BINARY="./mne-extracted/main.pkg/Payload${MNE_INSTALL_PREFIX}/conda.exe" + DIR="./mne-extracted/prepare_installation.pkg/Payload/.mne-python" + echo "Checking ${DIR} exists" + test -d "$DIR" + ls -al "$DIR" + BINARY="${DIR}/conda.exe" echo "Checking ${BINARY} exists" test -e "${BINARY}" echo "Checking ${BINARY} is signed" @@ -304,7 +313,8 @@ jobs: echo "MNE_INSTALLER_VERSION=${MNE_INSTALLER_VERSION}" echo "MNE_ACTIVATE=${MNE_ACTIVATE}" >> $GITHUB_ENV echo "MNE_ACTIVATE=${MNE_ACTIVATE}" - echo "MNE_INSTALL_PREFIX=$MNE_INSTALL_PREFIX" >> $GITHUB_ENV + echo "MNE_INSTALL_PREFIX=${MNE_INSTALL_PREFIX}" >> $GITHUB_ENV + echo "MNE_INSTALL_PREFIX=${MNE_INSTALL_PREFIX}" echo "NSIS_SCRIPTS_RAISE_ERRORS=1" >> $GITHUB_ENV - name: Download appropriate installer diff --git a/recipes/mne-python_1.5/construct.yaml b/recipes/mne-python_1.5/construct.yaml index e45d6dcd..4385ee19 100644 --- a/recipes/mne-python_1.5/construct.yaml +++ b/recipes/mne-python_1.5/construct.yaml @@ -1,4 +1,4 @@ -version: 1.5.0_1 +version: 1.5.1_0 name: MNE-Python company: MNE-Python Developers # When the version above changes to a new major/minor, it needs to be updated @@ -18,11 +18,11 @@ conclusion_file: ../../assets/conclusion.rtf # [not win] initialize_by_default: false register_python_default: false -default_prefix: ${HOME}/mne-python/1.5.0_1 # [linux] -default_prefix: "%USERPROFILE%\\mne-python\\1.5.0_1" # [win] -default_prefix_domain_user: "%LOCALAPPDATA%\\mne-python\\1.5.0_1" # [win] -default_prefix_all_users: "%ALLUSERSPROFILE%\\mne-python\\1.5.0_1" # [win] -default_location_pkg: "Applications/MNE-Python/1.5.0_1" # [osx] +default_prefix: ${HOME}/mne-python/1.5.1_0 # [linux] +default_prefix: "%USERPROFILE%\\mne-python\\1.5.1_0" # [win] +default_prefix_domain_user: "%LOCALAPPDATA%\\mne-python\\1.5.1_0" # [win] +default_prefix_all_users: "%ALLUSERSPROFILE%\\mne-python\\1.5.1_0" # [win] +default_location_pkg: "Applications/MNE-Python/1.5.1_0" # [osx] pkg_name: ".mne-python" # [osx] progress_notifications: true # [osx] install_path_exists_error_text: | @@ -30,10 +30,10 @@ install_path_exists_error_text: | uninstall_name: MNE-Python ${VERSION} (Python ${PYVERSION}) -installer_filename: MNE-Python-1.5.0_1-macOS_Intel.pkg # [osx and not arm64] -installer_filename: MNE-Python-1.5.0_1-macOS_M1.pkg # [osx and arm64] -installer_filename: MNE-Python-1.5.0_1-Windows.exe # [win] -installer_filename: MNE-Python-1.5.0_1-Linux.sh # [linux] +installer_filename: MNE-Python-1.5.1_0-macOS_Intel.pkg # [osx and not arm64] +installer_filename: MNE-Python-1.5.1_0-macOS_M1.pkg # [osx and arm64] +installer_filename: MNE-Python-1.5.1_0-Windows.exe # [win] +installer_filename: MNE-Python-1.5.1_0-Linux.sh # [linux] post_install: ../../assets/post_install_macOS.sh # [osx] post_install: ../../assets/post_install_linux.sh # [linux] @@ -71,8 +71,8 @@ specs: # - mne-installer-menus =1.4dev0=*_20230503 # - mne-bids =0.11dev0=*_20221007 # TODO: ⛔️ ⛔️ ⛔️ DEV BUILDS STOP: CHANGE BEFORE RELEASE! ⛔️ ⛔️ ⛔️ - - mne =1.5.0=*_0 - - mne-installer-menus =1.5.0=*_0 + - mne =1.5.1=*_0 + - mne-installer-menus =1.5.1=*_0 # For testing purposes with build_local.sh, you can comment out all deps # below for speed, and change mne to mne-base above - mne-bids =0.13.0 @@ -134,7 +134,7 @@ specs: # various biological signals (ECG, EOG, EMG, …) - neurokit2 =0.2.5 # GitHub client, https://cli.github.com - - gh =2.33.0 + - gh =2.34.0 # NeuroSpin needs the following - questionary =2.0.0 - pqdm =0.2.0 @@ -167,4 +167,4 @@ condarc: - conda-forge channel_priority: strict allow_other_channels: false - env_prompt: "(mne-1.5.0_1) " + env_prompt: "(mne-1.5.1_0) " diff --git a/tests/test_outdated.py b/tests/test_outdated.py index 71a0bc85..0d691381 100644 --- a/tests/test_outdated.py +++ b/tests/test_outdated.py @@ -14,7 +14,7 @@ construct_yaml = yaml.safe_load(construct_yaml_path.read_text(encoding="utf-8")) specs = construct_yaml["specs"] -LJUST = 20 +LJUST = 25 print(f"Analyzing spec file: {construct_yaml_path}\n")