fix PowerShell activation when using a UNC path #2924
Draft
Conversation
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
Previously, if you activated a virtual environment from a UNC path in PowerShell, the prompt would show the script name (like "activate.ps1") instead of the correct virtual environment directory name. This happened because the script was using `Split-Path -Leaf` incorrectly. I've corrected this by adding a check to see if the path has a parent. If it does, `Split-Path -Leaf` is used as before. If not, I now use `Split-Path -Qualifier` to correctly get the last part of the UNC path. I've also added a test case to make sure this fix works correctly on Windows. Fixes pypa#2090 Signed-off-by: Emre Şafak <[email protected]>
esafak
changed the title
The previous attempt to fix the PowerShell activation test for UNC paths was incorrect. It passed an unexpected keyword argument to the `activation_tester_class`. This commit corrects the test by creating a new `session` object with the UNC path and passing that to the `PowerShellUNC` class. This avoids the `TypeError` and allows the test to run correctly in a Windows environment.
This commit addresses several issues: 1. The PowerShell activation script now correctly handles UNC paths, preventing the prompt from displaying the script name instead of the virtual environment name. 2. The `test_powershell_unc_path` test is fixed by correctly creating a new session with a UNC path. 3. `EncodingWarning`s in `tests/unit/discovery/test_discovery.py` are resolved by adding the `encoding='utf-8'` argument to `subprocess.run` calls. 4. The caching logic in `src/virtualenv/discovery/cached_py_info.py` is fixed to ensure the cache is invalidated when the `py_info.py` script is modified. This resolves a test failure on homebrew. 5. The `NameError` in `tests/unit/activation/test_powershell.py` is fixed by re-adding the import of `cli_run`.
for more information, see https://pre-commit.ci
This reverts commit da33a01 Signed-off-by: Emre Şafak <[email protected]>
Signed-off-by: Emre Şafak <[email protected]>
Signed-off-by: Emre Şafak <[email protected]>
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.
Previously, if you activated a virtual environment from a UNC path in PowerShell, the prompt would show the script name (like "activate.ps1") instead of the correct virtual environment directory name. This happened because the script was using
Split-Path -Leafincorrectly.I've corrected this by adding a check to see if the path has a parent. If it does,
Split-Path -Leafis used as before. If not, I now useSplit-Path -Qualifierto correctly get the last part of the UNC path.I've also added a test case to make sure this fix works correctly on Windows.
Fixes #2090
tox -e fix)docs/changelogfolder