From: Brett Cannon <54418+brettcannon@users.noreply.github.com>
Date: Sat, 23 Nov 2019 07:32:27 +0000 (-0800)
Subject: bpo-38899: virtual environment activation for fish should use `source` (GH-17359)
X-Git-Tag: v3.9.0a2~128
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=84b1ff65609c5910b4f838adbe1ead83baae7dbf;p=thirdparty%2FPython%2Fcpython.git

bpo-38899: virtual environment activation for fish should use `source` (GH-17359)



The previously documented use of `.` is considered deprecated (https://fishshell.com/docs/current/commands.html#source).


https://bugs.python.org/issue38899



Automerge-Triggered-By: @brettcannon
---

diff --git a/Doc/using/venv-create.inc b/Doc/using/venv-create.inc
index cf5af437d6ae..6c6617dc158f 100644
--- a/Doc/using/venv-create.inc
+++ b/Doc/using/venv-create.inc
@@ -104,7 +104,7 @@ directory containing the virtual environment):
 +=============+=================+=========================================+
 | POSIX       | bash/zsh        | $ source <venv>/bin/activate            |
 +-------------+-----------------+-----------------------------------------+
-|             | fish            | $ . <venv>/bin/activate.fish            |
+|             | fish            | $ source <venv>/bin/activate.fish       |
 +-------------+-----------------+-----------------------------------------+
 |             | csh/tcsh        | $ source <venv>/bin/activate.csh        |
 +-------------+-----------------+-----------------------------------------+
diff --git a/Lib/venv/scripts/posix/activate.fish b/Lib/venv/scripts/posix/activate.fish
index 777d51cb69b0..d213b9060a68 100644
--- a/Lib/venv/scripts/posix/activate.fish
+++ b/Lib/venv/scripts/posix/activate.fish
@@ -1,5 +1,5 @@
-# This file must be used with ". bin/activate.fish" *from fish* (http://fishshell.org);
-# you cannot run it directly.
+# This file must be used with "source <venv>/bin/activate.fish" *from fish*
+# (http://fishshell.org); you cannot run it directly.
 
 function deactivate  -d "Exit virtualenv and return to normal shell environment"
     # reset old environment variables
diff --git a/Misc/NEWS.d/next/Documentation/2019-11-22-15-57-29.bpo-38899.4aYPW2.rst b/Misc/NEWS.d/next/Documentation/2019-11-22-15-57-29.bpo-38899.4aYPW2.rst
new file mode 100644
index 000000000000..4ee178bfb1b3
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2019-11-22-15-57-29.bpo-38899.4aYPW2.rst
@@ -0,0 +1,3 @@
+Update documentation to state that to activate virtual environments under
+fish one should use `source`, not `.` as documented at
+https://fishshell.com/docs/current/commands.html#source.