Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MAINT: Use bundle_tools_3 and fix various bugs #195

Merged
merged 64 commits into from
Sep 6, 2023
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
48ae61d
MAINT: Use bundle_tools_3
larsoner Jul 13, 2023
2930c71
FIX: No patch
larsoner Jul 13, 2023
0678ef9
WIP: Maybe?
larsoner Jul 13, 2023
38f5148
FIX: Wordpad
larsoner Jul 13, 2023
f378242
FIX: Again
larsoner Jul 13, 2023
7ad989e
Revert "FIX: Again"
larsoner Jul 13, 2023
b74eeee
FIX: NOT WIN
larsoner Jul 13, 2023
4938ecd
MAINT: Rerun and cruft
larsoner Jul 17, 2023
b959606
FIX: No patch
larsoner Jul 17, 2023
ca3fa25
FIX: Defaults
larsoner Jul 17, 2023
1afb4b3
FIX: SPacing
larsoner Jul 17, 2023
9fd2a61
FIX: Suggestion
larsoner Jul 17, 2023
0ab84f2
ENH: Notifications
larsoner Jul 17, 2023
ba344c9
FIX: Comment
larsoner Jul 17, 2023
b460387
FIX: Ver
larsoner Jul 17, 2023
a61e02d
FIX: Trim
larsoner Jul 17, 2023
158b171
FIX: Paths
larsoner Jul 17, 2023
00b07f0
FIX: Try again
larsoner Jul 18, 2023
60670a0
FIX: Tests
larsoner Jul 18, 2023
3a38d3f
FIX: Test
larsoner Jul 18, 2023
0b2c08f
FIX: Test
larsoner Jul 18, 2023
347d993
Merge branch 'main' into bt3
hoechenberger Jul 26, 2023
145c280
Merge remote-tracking branch 'upstream/main' into bt3
larsoner Aug 30, 2023
8b49f0c
FIX: Update
larsoner Aug 30, 2023
b78744f
FIX: Try here
larsoner Aug 30, 2023
8ecfc03
FIX: Install it
larsoner Aug 30, 2023
a86e052
FIX: Pin
larsoner Aug 30, 2023
5d7b1ea
WIP: Restore emoji
larsoner Aug 31, 2023
958f4c1
FIX: Spyder
larsoner Aug 31, 2023
844551f
WIP: Simplify macOS
larsoner Aug 31, 2023
f0a96e3
FIX: Back to library
larsoner Aug 31, 2023
fe8406f
FIX: Fixes for macOS
larsoner Aug 31, 2023
fe9e273
FIX: Path
larsoner Aug 31, 2023
d5927c3
FIX: Path
larsoner Aug 31, 2023
23a5813
FIX: More specific
larsoner Aug 31, 2023
7ce3af3
FIX: No longer needed
larsoner Aug 31, 2023
91c4567
FIX: CI
larsoner Aug 31, 2023
0bb99ec
FIX: Revert
larsoner Aug 31, 2023
85ae490
FIX: Revert
larsoner Aug 31, 2023
cbb43b6
FIX: Action
larsoner Aug 31, 2023
3bf2cea
FIX: environment.yml
larsoner Aug 31, 2023
f382e78
TST: Ping
larsoner Aug 31, 2023
6707055
FIX: Simplify
larsoner Aug 31, 2023
05474c7
FIX: Simplify more
larsoner Aug 31, 2023
1a51a10
FIX: Unify
larsoner Aug 31, 2023
356cc95
Update build.yml
larsoner Sep 1, 2023
f4a7d9e
Update post_install_windows.bat
larsoner Sep 1, 2023
4c5cce2
Update post_install_windows.bat
larsoner Sep 1, 2023
955fb7f
FIX: libmamba
larsoner Sep 1, 2023
67867d9
FIX: Workaround
larsoner Sep 1, 2023
c49ac77
FIX: Maybe
larsoner Sep 1, 2023
7019c7b
FIX: Maybe
larsoner Sep 1, 2023
e35f34b
FIX: Fixes
larsoner Sep 1, 2023
49223a5
FIX: Facilitate editable install
larsoner Sep 1, 2023
e595c16
FIX: Msg
larsoner Sep 1, 2023
483788a
FIX: Remove timeout
larsoner Sep 1, 2023
c5dfc2a
ENH: Menus here
larsoner Sep 1, 2023
ea00c68
Revert "ENH: Menus here"
larsoner Sep 1, 2023
961f550
Update assets/post_install_macOS.sh [ci skip]
larsoner Sep 1, 2023
b847b41
Merge branch 'main' into bt3
larsoner Sep 2, 2023
7f10d03
FIX: Nest
larsoner Sep 2, 2023
d9d2415
FIX: Whoops
larsoner Sep 2, 2023
ee224f6
ENH: Add development tools
larsoner Sep 5, 2023
5585a04
FIX: Versions
larsoner Sep 6, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/`.
Binary file modified assets/conclusion.rtf
Binary file not shown.
12 changes: 0 additions & 12 deletions assets/constructor_macOS_arm64.patch

This file was deleted.

101 changes: 0 additions & 101 deletions assets/constructor_macOS_common.patch

This file was deleted.

12 changes: 0 additions & 12 deletions assets/constructor_macOS_i386.patch

This file was deleted.

Binary file modified assets/license.rtf
Binary file not shown.
Binary file modified assets/welcome.rtf
Binary file not shown.
13 changes: 6 additions & 7 deletions environment.yml
Original file line number Diff line number Diff line change
@@ -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
5 changes: 3 additions & 2 deletions recipes/mne-python_1.4/construct.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,17 @@ 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]
default_location_pkg: "/Applications" # [osx]
larsoner marked this conversation as resolved.
Show resolved Hide resolved
pkg_name: "MNE-Python" # [osx]

uninstall_name: MNE-Python ${VERSION} (Python ${PYVERSION})

Expand Down
1 change: 0 additions & 1 deletion tools/build_local.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
26 changes: 0 additions & 26 deletions tools/patch_constructor.sh

This file was deleted.