-
Notifications
You must be signed in to change notification settings - Fork 24
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
Allow only CLI specs as long as compatible with pins #294
Merged
Conversation
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
conda-bot
added
the
cla-signed
[bot] added once the contributor has signed the CLA
label
Sep 26, 2023
3 tasks
jaimergp
changed the title
Allow only CLI specs as long as compatible with pins (#289 alternative)
Allow only CLI specs as long as compatible with pins
Sep 26, 2023
3 tasks
jezdez
approved these changes
Sep 26, 2023
Comment on lines
-760
to
+717
if sis.requested[name].match(spec): # <-- this line is buggy! | ||
if True: # compatible_specs(index, sis.requested[name], spec): | ||
# assume compatible, we will raise later otherwise |
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.
that seems weird to have still around
jaimergp
added a commit
that referenced
this pull request
Sep 26, 2023
* add compatible_matchspecs (MatchSpec.match is for PackageRecords only) * more useful exception * add test * add news * pre-commit * pre-commit * fix boolean logic * simplify * commit progress so far * remove test * add new exception for request and pinned errors * do not allow pinned and requested specs * cleanup * pre-commit * add tests * pre-commit * add docs * ensure pins are in SolverOutputState.specs even if not explicit * format exception * raise earlier, no index needed * fix state tests * pre-commit * relax test constraints * better error messages in unsolvable pins * fix test * pre-commit * override channels * amend news * fix test * override channels here too * Apply suggestions from code review Co-authored-by: Travis Hathaway <travis.j.hathaway@gmail.com> * Apply suggestions from code review * Allow only CLI specs as long as compatible with pins (#294) * implement some compatibility checks * clean up a bit and add more tests * pre-commit * be explicit about channels * simplify error logic for installed pins * pre-commit --------- Co-authored-by: Travis Hathaway <travis.j.hathaway@gmail.com>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Labels
cla-signed
[bot] added once the contributor has signed the CLA
locked
[bot] locked due to inactivity
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.
Description
Extends #289 to allow CLI specs compatible with pins. It will still reject incompatible ones, with the standard
SpecsConfigurationConflictError
.Checklist - did you ...
news
directory (using the template) for the next release's release notes?