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: Prioritize conda-forge channel so that stable releases are pulled above unstable ones (Installers) #22424

Merged
merged 4 commits into from
Sep 17, 2024

Conversation

mrclary
Copy link
Contributor

@mrclary mrclary commented Sep 4, 2024

Description of Changes

Release of 6.0.0 revealed an issue where the conda solver would take 6.0.0rc2 as satisfying the specification 6.0.0. I did not realize that 6.0.0 lacked the specificity required to distinguish it from 6.0.0rc2, but not the other way around.

By setting the conda-forge channel first, it will take priority over label/spyder_dev and take the 6.0.0 package first. On developer and release candidate builds, the version specificity, e.g. 6.0.1.dev0 or 6.0.1rc1, will ensure that stable versions are overlooked in the higher priority conda-forge channel and the specified version will be obtained from the appropriate channel.

Fixes #22416

@mrclary mrclary self-assigned this Sep 4, 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, thanks @mrclary!

@ccordoba12 ccordoba12 changed the title PR: Prioritize conda-forge channel so that stable releases are prioritized on installer builds PR: Prioritize conda-forge channel so that stable releases are pulled above unstable ones (Installers) Sep 5, 2024
@ccordoba12 ccordoba12 added this to the v6.0.1 milestone Sep 5, 2024
@dalthviz
Copy link
Member

dalthviz commented Sep 6, 2024

Could it be worthy to also add a CI step that checks that the spyder-runtime environment ends up with the actual expected version? Besides that this LGTM 👍

@mrclary
Copy link
Contributor Author

mrclary commented Sep 6, 2024

Could it be worthy to also add a CI step that checks that the spyder-runtime environment ends up with the actual expected version?

This is probably a good idea. It will require more work in order to expose the expected version. Let me know if you'd like me to include that in this PR.

@dalthviz
Copy link
Member

dalthviz commented Sep 6, 2024

I think makes sense adding that here, however what do you think @ccordoba12 ?

@ccordoba12
Copy link
Member

Yeah, I think we can include it here.

@mrclary mrclary force-pushed the 6.0.0_1 branch 2 times, most recently from c695d07 to ea891d5 Compare September 7, 2024 22:09
@mrclary
Copy link
Contributor Author

mrclary commented Sep 7, 2024

Okay, the test step now verifies that the installed Spyder version is the expected version.

@mrclary mrclary force-pushed the 6.0.0_1 branch 2 times, most recently from 17563f8 to a003501 Compare September 9, 2024 14:20
Copy link
Member

@dalthviz dalthviz left a comment

Choose a reason for hiding this comment

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

Thanks @mrclary ! LGTM 👍

Just in case, is there any other thing pending here or should I proceed with the merge?

@mrclary
Copy link
Contributor Author

mrclary commented Sep 17, 2024

Nothing else pending. Thanks @dalthviz.

@dalthviz dalthviz merged commit be3c654 into spyder-ide:master Sep 17, 2024
24 checks passed
@dalthviz
Copy link
Member

@meeseeksdev please backport to 6.x

meeseeksmachine pushed a commit to meeseeksmachine/spyder that referenced this pull request Sep 17, 2024
…hat stable releases are pulled above unstable ones (Installers)
dalthviz added a commit that referenced this pull request Sep 17, 2024
…424-on-6.x

Backport PR #22424 on branch 6.x (PR: Prioritize conda-forge channel so that stable releases are pulled above unstable ones (Installers))
@mrclary mrclary deleted the 6.0.0_1 branch September 24, 2024 18:06
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.

Installers for 6.0.0 release come with 6.0.0rc2
3 participants