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

PR: Update for new menuinst and friends and new Spyder feedstock (Installers) #21647

Merged
merged 22 commits into from
Feb 8, 2024

Conversation

mrclary
Copy link
Contributor

@mrclary mrclary commented Dec 23, 2023

Description of Changes

  • Update to latest conda 23.11.0, conda-standalone 23.11.0, menuinst 2.0.2, and constructor 3.6.0.
  • The installer package post-install script now creates an empty file conda-based-app next to spyder-menu.json. is_conda_based_app checks for conda-based-app instead of spyder-menu.json. This is required since spyder-menu.json is will not be unique to our standalone installer.
  • No longer patch Spyder's feedstock on installer build. Also remove spyder-menu.json and relevant files as they are included in the standard feedstock.

Merge after:

Issue(s) Resolved

Fixes #21640

@mrclary mrclary self-assigned this Dec 23, 2023
@mrclary mrclary added this to the v6.0beta1 milestone Dec 23, 2023
@mrclary mrclary force-pushed the issue-21640-fix-update-2 branch 3 times, most recently from d414896 to d251168 Compare December 26, 2023 17:51
@mrclary mrclary force-pushed the issue-21640-fix-update-2 branch 2 times, most recently from 446a100 to ca0e463 Compare January 2, 2024 01:29
@mrclary mrclary force-pushed the issue-21640-fix-update-2 branch 4 times, most recently from f999509 to b79eac3 Compare January 11, 2024 19:01
@pep8speaks
Copy link

pep8speaks commented Jan 11, 2024

Hello @mrclary! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found:

Line 269:80: E501 line too long (80 > 79 characters)
Line 300:80: E501 line too long (80 > 79 characters)
Line 331:80: E501 line too long (84 > 79 characters)

Line 56:80: E501 line too long (86 > 79 characters)

Comment last updated at 2024-02-06 03:49:30 UTC

@mrclary mrclary force-pushed the issue-21640-fix-update-2 branch 5 times, most recently from 2268400 to 4acf354 Compare January 12, 2024 22:32
@mrclary mrclary marked this pull request as ready for review January 12, 2024 22:44
@mrclary mrclary force-pushed the issue-21640-fix-update-2 branch 2 times, most recently from 5af365f to 22c0d55 Compare January 18, 2024 04:39
@mrclary mrclary marked this pull request as draft January 19, 2024 17:15
@mrclary mrclary changed the title PR: No longer patch spyder-feedstock on installer builds PR: Update for new menuinst and friends and new Spyder feedstock Jan 19, 2024
Copy link
Member

@ccordoba12 ccordoba12 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me now, thanks @mrclary!

mrclary and others added 22 commits February 5, 2024 19:49
Conda install of spyder package clobbers Menu/* and breaks the app.
Including Menu in standard conda package makes standard installs register as conda-based apps if checking for spyder-menu.json.
So the solution is to use a file that only the installer will create: conda-based-app in the Menu directory.
…t v2 support; remove bundle_tools_3 channel dependence.

Sometime between mamba=1.4.2 and mamba=1.5.6, mamba mambabuild generates error "ValueError: unrecognized 'args' object". This does not affect conda mambabuild.

Ensure correct versions of conda and menuinst are installed in base environment.

Now that all packages are in conda-forge, strict channel priority will continue to work but flexible doesn't hurt.
Generally, macOS uses BSD sed and Linux uses GNU sed. However, in some circumstances (CI macOS arm64) it appears that macOS may be using GNU instead of BSD. Therefore it is best to check sed directly for BSD/GNU rather than using the platform as a proxy.

Remove patch for old-style markers.
Add aliases to all shell init files in user mode.
Fixed issue where post-install script would prematurely exit when adding alias to shell init files.
Use menuinst to remove shortcut when uninstalling.
Show progress notifications (macOS)
Add spyder_kernels_rc and spyder_dev channels so that non-stable releases can be resolved.
…ipt so that spyder post-link script can see it.
…staller_test.sh script

Note that using the shabang line is not effective since the path to the base environment python executable is not known until install time. The post-install script could modify the cli script, but that is too convoluted; also, it wouldn't benefit Windows either.
* Make uninstall script executable to all
* Check for write permissions and warn user when sudo is required.
@ccordoba12
Copy link
Member

@dalthviz, thoughts about this one? This and PR #21669 are the last things before being able to release alpha4.

@ccordoba12
Copy link
Member

Let's merge to start the release of alpha4.

@ccordoba12 ccordoba12 changed the title PR: Update for new menuinst and friends and new Spyder feedstock PR: Update for new menuinst and friends and new Spyder feedstock (Installers) Feb 8, 2024
@ccordoba12 ccordoba12 merged commit 345efc2 into spyder-ide:master Feb 8, 2024
22 checks passed
@mrclary mrclary deleted the issue-21640-fix-update-2 branch February 8, 2024 15:02
@mrclary mrclary mentioned this pull request May 13, 2024
16 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Minor update to standalone, conda-based installation via conda breaks the application
3 participants