-
Notifications
You must be signed in to change notification settings - Fork 9
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
Changes from 57 commits
Commits
Show all changes
64 commits
Select commit
Hold shift + click to select a range
48ae61d
MAINT: Use bundle_tools_3
larsoner 2930c71
FIX: No patch
larsoner 0678ef9
WIP: Maybe?
larsoner 38f5148
FIX: Wordpad
larsoner f378242
FIX: Again
larsoner 7ad989e
Revert "FIX: Again"
larsoner b74eeee
FIX: NOT WIN
larsoner 4938ecd
MAINT: Rerun and cruft
larsoner b959606
FIX: No patch
larsoner ca3fa25
FIX: Defaults
larsoner 1afb4b3
FIX: SPacing
larsoner 9fd2a61
FIX: Suggestion
larsoner 0ab84f2
ENH: Notifications
larsoner ba344c9
FIX: Comment
larsoner b460387
FIX: Ver
larsoner a61e02d
FIX: Trim
larsoner 158b171
FIX: Paths
larsoner 00b07f0
FIX: Try again
larsoner 60670a0
FIX: Tests
larsoner 3a38d3f
FIX: Test
larsoner 0b2c08f
FIX: Test
larsoner 347d993
Merge branch 'main' into bt3
hoechenberger 145c280
Merge remote-tracking branch 'upstream/main' into bt3
larsoner 8b49f0c
FIX: Update
larsoner b78744f
FIX: Try here
larsoner 8ecfc03
FIX: Install it
larsoner a86e052
FIX: Pin
larsoner 5d7b1ea
WIP: Restore emoji
larsoner 958f4c1
FIX: Spyder
larsoner 844551f
WIP: Simplify macOS
larsoner f0a96e3
FIX: Back to library
larsoner fe8406f
FIX: Fixes for macOS
larsoner fe9e273
FIX: Path
larsoner d5927c3
FIX: Path
larsoner 23a5813
FIX: More specific
larsoner 7ce3af3
FIX: No longer needed
larsoner 91c4567
FIX: CI
larsoner 0bb99ec
FIX: Revert
larsoner 85ae490
FIX: Revert
larsoner cbb43b6
FIX: Action
larsoner 3bf2cea
FIX: environment.yml
larsoner f382e78
TST: Ping
larsoner 6707055
FIX: Simplify
larsoner 05474c7
FIX: Simplify more
larsoner 1a51a10
FIX: Unify
larsoner 356cc95
Update build.yml
larsoner f4a7d9e
Update post_install_windows.bat
larsoner 4c5cce2
Update post_install_windows.bat
larsoner 955fb7f
FIX: libmamba
larsoner 67867d9
FIX: Workaround
larsoner c49ac77
FIX: Maybe
larsoner 7019c7b
FIX: Maybe
larsoner e35f34b
FIX: Fixes
larsoner 49223a5
FIX: Facilitate editable install
larsoner e595c16
FIX: Msg
larsoner 483788a
FIX: Remove timeout
larsoner c5dfc2a
ENH: Menus here
larsoner ea00c68
Revert "ENH: Menus here"
larsoner 961f550
Update assets/post_install_macOS.sh [ci skip]
larsoner b847b41
Merge branch 'main' into bt3
larsoner 7f10d03
FIX: Nest
larsoner d9d2415
FIX: Whoops
larsoner ee224f6
ENH: Add development tools
larsoner 5585a04
FIX: Versions
larsoner File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,3 +5,4 @@ tests/test.png | |
.vscode | ||
.pytest_cache | ||
.DS_Store | ||
__pycache__ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,168 @@ | ||
{ | ||
"$schema": "https://json-schema.org/draft-07/schema", | ||
"$id": "https://schemas.conda.io/menuinst-1.schema.json", | ||
"menu_name": "MNE-Python (1.5.0)", | ||
"menu_items": [{ | ||
"name": "Spyder (MNE)", | ||
"description": "The Spyder development environment", | ||
"icon": "{{ MENU_DIR }}/mne_spyder.{{ ICON_EXT }}", | ||
"command": ["will be overridden in platforms section"], | ||
"activate": true, | ||
"terminal": false, | ||
"platforms": { | ||
"win": { | ||
"command": [ | ||
"{{ PYTHONW }}", | ||
"{{ SCRIPTS_DIR }}\\spyder-script.py" | ||
], | ||
"desktop": false | ||
}, | ||
"linux": { | ||
"command": ["spyder"], | ||
"Categories": [ | ||
"Science" | ||
] | ||
}, | ||
"osx": { | ||
"command": ["spyder"], | ||
"CFBundleName": "Spyder (MNE-Python 1.5.0)", | ||
"CFBundleDisplayName": "Spyder (MNE-Python 1.5.0)", | ||
"CFBundleVersion": "1.5.0" | ||
} | ||
} | ||
}, | ||
{ | ||
"name": "System Info (MNE)", | ||
"description": "Information on the MNE-Python runtime environment", | ||
"icon": "{{ MENU_DIR }}/mne_info.{{ ICON_EXT }}", | ||
"command": [ | ||
"{{ PYTHON }}", | ||
"{{ MENU_DIR }}/mne_sys_info.py" | ||
], | ||
"activate": true, | ||
"terminal": true, | ||
"platforms": { | ||
"win": { | ||
"desktop": false | ||
}, | ||
"linux": { | ||
"Categories": [ | ||
"Science" | ||
] | ||
}, | ||
"osx": { | ||
"CFBundleName": "System Information (MNE-Python 1.5.0)", | ||
"CFBundleDisplayName": "System Information (MNE-Python 1.5.0)", | ||
"CFBundleVersion": "1.5.0" | ||
} | ||
} | ||
}, | ||
{ | ||
"name": "Prompt (MNE)", | ||
"description": "MNE-Python console prompt", | ||
"icon": "{{ MENU_DIR }}/mne_console.{{ ICON_EXT }}", | ||
"activate": true, | ||
"terminal": true, | ||
"command": ["will be overridden in platforms section"], | ||
"platforms": { | ||
"win": { | ||
"command": [ | ||
"%SystemRoot%\\system32\\cmd.exe", | ||
"/K", | ||
"{{ MENU_DIR }}\\mne_open_prompt.bat" | ||
], | ||
"desktop": false | ||
}, | ||
"linux": { | ||
"command": [ | ||
"exec", | ||
"bash", | ||
"--init-file", | ||
"{{ MENU_DIR }}/mne_open_prompt.sh" | ||
], | ||
"Categories": [ | ||
"Science" | ||
] | ||
}, | ||
"osx": { | ||
"command": [ | ||
"osascript", | ||
"{{ MENU_DIR }}/mne_open_prompt.applescript" | ||
], | ||
"CFBundleName": "Prompt (MNE-Python 1.5.0)", | ||
"CFBundleDisplayName": "Prompt (MNE-Python 1.5.0)", | ||
"CFBundleVersion": "1.5.0" | ||
} | ||
} | ||
}, | ||
{ | ||
"name": "Tutorials (MNE)", | ||
"description": "MNE-Python online tutorials", | ||
"icon": "{{ MENU_DIR }}/mne_web.{{ ICON_EXT }}", | ||
"activate": false, | ||
"terminal": false, | ||
"command": ["will be overridden in platforms section"], | ||
"platforms": { | ||
"win": { | ||
"command": [ | ||
"%SystemRoot%\\system32\\WindowsPowerShell\\v1.0\\powershell.exe", | ||
"\"start https://mne.tools/stable/auto_tutorials -WindowStyle hidden\"" | ||
], | ||
"desktop": false | ||
}, | ||
"linux": { | ||
"command": [ | ||
"xdg-open", | ||
"https://mne.tools/stable/auto_tutorials/" | ||
], | ||
"Categories": [ | ||
"Science" | ||
] | ||
}, | ||
"osx": { | ||
"command": [ | ||
"open", | ||
"https://mne.tools/stable/auto_tutorials/" | ||
], | ||
"CFBundleName": "Tutorials (MNE-Python 1.5.0)", | ||
"CFBundleDisplayName": "Tutorials (MNE-Python 1.5.0)", | ||
"CFBundleVersion": "1.5.0" | ||
} | ||
} | ||
}, | ||
{ | ||
"name": "User Forum (MNE)", | ||
"description": "MNE-Python forum for discussions, problem solving, and information exchange", | ||
"icon": "{{ MENU_DIR }}/mne_forum.{{ ICON_EXT }}", | ||
"activate": false, | ||
"terminal": false, | ||
"command": ["will be overridden in platforms section"], | ||
"platforms": { | ||
"win": { | ||
"command": [ | ||
"%SystemRoot%\\system32\\WindowsPowerShell\\v1.0\\powershell.exe", | ||
"\"start https://mne.discourse.group -WindowStyle hidden\"" | ||
], | ||
"desktop": false | ||
}, | ||
"linux": { | ||
"command": [ | ||
"xdg-open", | ||
"https://mne.discourse.group" | ||
], | ||
"Categories": [ | ||
"Science" | ||
] | ||
}, | ||
"osx": { | ||
"command": [ | ||
"open", | ||
"https://mne.discourse.group" | ||
], | ||
"CFBundleName": "Forum (MNE-Python 1.5.0)", | ||
"CFBundleDisplayName": "Forum (MNE-Python 1.5.0)", | ||
"CFBundleVersion": "1.5.0" | ||
} | ||
} | ||
}] | ||
} |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
tell application "Terminal" | ||
do script "source /home/conda/feedstock_root/build_artifacts/mne-python_1692127656949/_h_env_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_/Menu/mne_open_prompt.sh" | ||
activate | ||
end tell |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
:: This is used to initialize the bash prompt on Windows. | ||
@ECHO OFF | ||
|
||
call %/home/conda/feedstock_root/build_artifacts/mne-python_1692127656949/_h_env_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_%\Scripts\Activate.bat | ||
FOR /F "tokens=*" %%g IN ('python --version') do (SET PYVER=%%g) | ||
FOR /F "tokens=*" %%g IN ('where python') do (SET PYPATH=%%g) | ||
FOR /F "tokens=*" %%g IN ('mne --version') do (SET MNEVER=%%g) | ||
|
||
ECHO Using %PYVER% from %PYPATH% | ||
ECHO This is %MNEVER% |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
#!/bin/bash | ||
|
||
# This is used to initialize the bash prompt on macOS and Linux. | ||
|
||
if [[ -f ~/.bashrc ]] && [[ ${OSTYPE} != 'darwin'* ]]; then | ||
source ~/.bashrc | ||
fi | ||
source /home/conda/feedstock_root/build_artifacts/mne-python_1692127656949/_h_env_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_/bin/activate | ||
echo "Using $(python --version) from $(which python)" | ||
echo "This is $(mne --version)" |
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This makes me think that the hack of doing
menuinst
ourselves will not work. Eithermenuinst
orconstructor
must do something magical here. I'll revert for now but c5dfc2a seems close to what we want