Skip to content

Support deactivating virtual environments without user intervention #22405

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.

Sign up for GitHub

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 24 commits into from
Nov 10, 2023
Merged

Support deactivating virtual environments without user intervention #22405

Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
db038f6
z
Nov 1, 2023
150445b
YAY
Nov 2, 2023
7408e42
Changes
Nov 2, 2023
8e20ff9
lint
Nov 2, 2023
5a47445
only build vsix
Nov 2, 2023
c06ec22
xz
Nov 6, 2023
cc38abb
Remove old way and install new way
Nov 7, 2023
785fa16
yes
Nov 7, 2023
c162dcb
Update how to parse vars
Nov 8, 2023
03b4567
Restore all env vars directly for powershell (to keep things simple)
Nov 8, 2023
4b44449
filter global interpreters the right way
Nov 8, 2023
17c79ca
z
Nov 8, 2023
362827f
Check it
Nov 8, 2023
4efa830
Do not add deactivate if its not a virtual env
Nov 8, 2023
a121f5b
restore ci
Nov 8, 2023
f7d13d1
Merge branch 'main' of https://github.com/microsoft/vscode-python int…
Nov 8, 2023
8dbf907
Rebase
Nov 8, 2023
af145b3
Edit message a bit
Nov 8, 2023
d8c7b10
Fix
Nov 8, 2023
69679a5
fix test
Nov 8, 2023
eae73f6
Add tests
Nov 9, 2023
f01e998
Do not import from test module
Nov 9, 2023
4948912
Track if shell integration is not working
Nov 9, 2023
657a8e1
Separate names from shell types
Nov 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Restore all env vars directly for powershell (to keep things simple)
  • Loading branch information
Kartik Raj committed Nov 8, 2023
commit 03b45670af70b42a20a96e90a8e5a25d106ed26e
24 changes: 1 addition & 23 deletions pythonFiles/deactivate/powershell/deactivate.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,4 @@
# Same as deactivate in "Activate.ps1"
function global:deactivate ([switch]$NonDestructive) {
if (Test-Path function:_OLD_VIRTUAL_PROMPT) {
copy-item function:_OLD_VIRTUAL_PROMPT function:prompt
remove-item function:_OLD_VIRTUAL_PROMPT
}
if (Test-Path env:_OLD_VIRTUAL_PYTHONHOME) {
copy-item env:_OLD_VIRTUAL_PYTHONHOME env:PYTHONHOME
remove-item env:_OLD_VIRTUAL_PYTHONHOME
}
if (Test-Path env:_OLD_VIRTUAL_PATH) {
copy-item env:_OLD_VIRTUAL_PATH env:PATH
remove-item env:_OLD_VIRTUAL_PATH
}
if (Test-Path env:VIRTUAL_ENV) {
remove-item env:VIRTUAL_ENV
}
if (!$NonDestructive) {
remove-item function:deactivate
}
}

# Load dotenv-style file and set environment variables
# Load dotenv-style file and restore environment variables
Get-Content -Path "$PSScriptRoot\envVars.txt" | ForEach-Object {
# Split each line into key and value at the first '='
$parts = $_ -split '=', 2
Expand Down