-
Notifications
You must be signed in to change notification settings - Fork 2.6k
Block scripts from overwriting python
#13051
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,6 +18,7 @@ use uv_normalize::PackageName; | |
| use uv_pypi_types::DirectUrl; | ||
| use uv_shell::escape_posix_for_single_quotes; | ||
| use uv_trampoline_builder::windows_script_launcher; | ||
| use uv_warnings::warn_user_once; | ||
|
|
||
| use crate::record::RecordEntry; | ||
| use crate::script::{scripts_from_ini, Script}; | ||
|
|
@@ -186,6 +187,25 @@ pub(crate) fn write_script_entrypoints( | |
| is_gui: bool, | ||
| ) -> Result<(), Error> { | ||
| for entrypoint in entrypoints { | ||
| let warn_names = ["activate", "activate_this.py"]; | ||
| if warn_names.contains(&entrypoint.name.as_str()) | ||
| || entrypoint.name.starts_with("activate.") | ||
| { | ||
| warn_user_once!( | ||
| "The script name `{}` is reserved for virtual environment activation scripts.", | ||
| entrypoint.name | ||
| ); | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why a warning here rather than an error? (Just wondering.)
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We could also error here, but they didn't feel critical enough so far |
||
| } | ||
| let reserved_names = ["python", "pythonw", "python3"]; | ||
| if reserved_names.contains(&entrypoint.name.as_str()) | ||
| || entrypoint | ||
| .name | ||
| .strip_prefix("python3.") | ||
| .is_some_and(|suffix| suffix.parse::<u8>().is_ok()) | ||
| { | ||
| return Err(Error::ReservedScriptName(entrypoint.name.clone())); | ||
| } | ||
|
|
||
| let entrypoint_absolute = entrypoint_path(entrypoint, layout); | ||
|
|
||
| let entrypoint_relative = pathdiff::diff_paths(&entrypoint_absolute, site_packages) | ||
|
|
||
This file contains hidden or 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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.