-
Notifications
You must be signed in to change notification settings - Fork 2
fix menu install location on Linux #16
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
base: main
Are you sure you want to change the base?
Conversation
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.
@matthew-brett ready for review/merge. There's still an issue with non-functional menus hanging around after building the package (conda/conda-build#5736), but that only affects devs working on this installer package, not users who simply install it.
@@ -1,7 +1,7 @@ | |||
{ | |||
"$schema": "https://json-schema.org/draft-07/schema", | |||
"$id": "https://schemas.conda.io/menuinst-1.schema.json", | |||
"menu_name": "Scientific Python (#PKG_VERSION#)", | |||
"menu_name": "#FOLDER_AND_CATEGORY_NAME#", |
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.
use a variable to set both menu_name
and Categories
. Until conda/menuinst#343 is fixed, it's necessary that they be the same.
@@ -12,4 +12,4 @@ echo "Using $(python --version) from $(which python)" | |||
echo "This is Scientific Python version #PKG_VERSION#" | |||
workdir="$HOME/Documents/scientific-python" | |||
mkdir -p $workdir | |||
pushd $workdir | |||
pushd $workdir > /dev/null |
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 suppresses the display of the pushd
stack when starting up the Scientific Python console
for fstem in ("console", "info", "web", "forum", "jupyter"): | ||
for ext in ("icns", "ico", "png"): | ||
copy2(in_path / f"{fstem}.{ext}", out_path / f"{pkg_name}_{fstem}.{ext}") | ||
|
||
for ext in ("sh", "applescript", "bat"): | ||
for fpath in in_path.glob(f'*.{ext}'): | ||
for fpath in in_path.glob(f"*.{ext}"): | ||
(out_path / f"{pkg_name}_{fpath.name}").write_text( | ||
txt_replace(fpath.read_text())) | ||
txt_replace(fpath.read_text()) | ||
) |
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.
these are linter auto-fixes
- pip: | ||
# ↓ TODO after menuinst release (something >2.3.1), move to normal dependencies list | ||
- git+https://github.com/conda/menuinst.git@3d11307485f8de8b813e2cec6866e2c00aee11da |
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.
conda/menuinst#340 is finally merged!
@@ -149,7 +149,7 @@ def main(): | |||
|
|||
if len(sys.argv) > 1 and sys.argv[1] == "nohtml": | |||
print() # blank line | |||
print(sep.join(out), file=sys.stdout) | |||
print(linesep.join(out), file=sys.stdout) |
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 was using "/" instead of newline when printing sysinfo to the terminal, oops
WIP.Closes #11