Trim injected python_version marker to (major, minor)
#2395
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
charliermarsh
commented
Mar 12, 2024
| } | ||
| if version.is_pre() { | ||
| return Err(format!("Python version {s} is a pre-release")); | ||
| } |
There was a problem hiding this comment.
I guess we can support this, but it makes the code below simpler because we can construct markers.python_full_version by just looking at the releases. Otherwise, I need to add some more handling to it.
charliermarsh
force-pushed
the
charlie/marker
branch
from
0163267 to
dd748c5
Compare
zanieb
reviewed
Mar 12, 2024
Comment on lines
80
to
81
| self.release()[0], | ||
| self.release()[1], |
There was a problem hiding this comment.
Mildly confused that we use .get(...).unwrap... elsewhere but not here?
zanieb
approved these changes
Mar 12, 2024
charliermarsh
force-pushed
the
charlie/marker
branch
4 times, most recently
from
731bc82 to
937bb86
Compare
charliermarsh
force-pushed
the
charlie/marker
branch
from
937bb86 to
b4c6bcf
Compare
charliermarsh
commented
Mar 12, 2024
| } | ||
|
|
||
| impl PythonRequirement { | ||
| pub fn new(interpreter: &Interpreter, markers: &MarkerEnvironment) -> Self { | ||
| Self { | ||
| installed: interpreter.python_version().clone(), | ||
| target: markers.python_full_version.version.clone(), | ||
| installed: interpreter.python_full_version().clone(), |
There was a problem hiding this comment.
This is the same value, I just renamed the method because it's the python_full_version marker.
charliermarsh
force-pushed
the
charlie/marker
branch
from
4d61daf to
7a119ee
Compare
charliermarsh
force-pushed
the
charlie/marker
branch
from
7a119ee to
2046136
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
Per PEP 508,
python_versionis just major and minor:Right now, we're using the provided version directly, so if it's, e.g.,
-p 3.11.8, we'll inject the wrong marker. This was causingpandasto omitnumpywhen-p 3.11.8was provided, since its markers look like:Closes #2392.