Skip to content

bpo-32718: Make Activate.ps1 for venv cross-platform and available on all platforms #9321

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
miss-islington merged 4 commits into from
Sep 21, 2018
Merged

bpo-32718: Make Activate.ps1 for venv cross-platform and available on all platforms #9321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
21c6889
Make Activate.ps1 cross-platform and available on all platforms
brettcannon Sep 14, 2018
8849e98
Make sure to quote the bin name
brettcannon Sep 16, 2018
4e0df83
Merge branch 'master' of https://github.com/python/cpython into power…
brettcannon Sep 21, 2018
ae37bdb
Add type info
brettcannon Sep 21, 2018
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
9 changes: 8 additions & 1 deletion Doc/whatsnew/3.8.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,13 @@ pathlib
contain characters unrepresentable at the OS level.
(Contributed by Serhiy Storchaka in :issue:`33721`.)

venv
----

* :mod:`venv` now includes an ``Activate.ps1`` script on all platforms for
activating virtual environments under PowerShell Core 6.1.
(Contributed by Brett Cannon in :issue:`32718`.)


Optimizations
=============
Expand Down Expand Up @@ -321,7 +328,7 @@ CPython bytecode changes

* The interpreter loop has been simplified by moving the logic of unrolling
the stack of blocks into the compiler. The compiler emits now explicit
instructions for adjusting the stack of values and calling the cleaning
instructions for adjusting the stack of values and calling the cleaning-
up code for :keyword:`break`, :keyword:`continue` and :keyword:`return`.

Removed opcodes :opcode:`BREAK_LOOP`, :opcode:`CONTINUE_LOOP`,
Expand Down
7 changes: 6 additions & 1 deletion Lib/venv/scripts/nt/Activate.ps1 → Lib/venv/scripts/common/Activate.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
function Script:add-bin([string]$envPath) {
$binPath = Join-Path -Path $env:VIRTUAL_ENV -ChildPath '__VENV_BIN_NAME__'
return ($binPath, $envPath) -join [IO.Path]::PathSeparator
}

function global:deactivate ([switch]$NonDestructive) {
# Revert to original values
if (Test-Path function:_OLD_VIRTUAL_PROMPT) {
Expand Down Expand Up @@ -48,4 +53,4 @@ if (Test-Path env:PYTHONHOME) {

# Add the venv to the PATH
copy-item env:PATH env:_OLD_VIRTUAL_PATH
$env:PATH = "$env:VIRTUAL_ENV\__VENV_BIN_NAME__;$env:PATH"
$env:PATH = add-bin $env:PATH
Comment thread
brettcannon marked this conversation as resolved.
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2018-09-14-12-38-49.bpo-32718.ICYQbt.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
The Activate.ps1 script from venv works with PowerShell Core 6.1 and is now
available under all operating systems.