Merge pull request #1585 from grasskin:master

PiperOrigin-RevId: 314259635

Author: copybara-github

site/en/install/pip.html

@@ -61,28 +61,26 @@ <h2>1. Install the Python development environment on your system</h2>
   Check if your Python environment is already configured:
 </p>
 
-<aside class="note">Requires Python 3.5–3.8 and pip &gt;= 19.0</aside>
+<aside class="note">Requires Python 3.5–3.8, pip and venv &gt;= 19.0</aside>
 
 <pre class="prettyprint lang-bsh">
 <code class="devsite-terminal">python3 --version</code>
 <code class="devsite-terminal">pip3 --version</code>
-<code class="devsite-terminal">virtualenv --version</code>
 </pre>
 
 <p>
   If these packages are already installed, skip to the next step.<br/>
   Otherwise, install <a href="https://www.python.org/" class="external">Python</a>, the
   <a href="https://pip.pypa.io/en/stable/installing/" class="external">pip package manager</a>,
-  and <a href="https://virtualenv.pypa.io/en/stable/" class="external">Virtualenv</a>:
+  and <a href="https://docs.python.org/3/library/venv.html" class="external">venv</a>:
 </p>
 
 <div class="ds-selector-tabs">
 <section>
 <h3>Ubuntu</h3>
 <pre class="prettyprint lang-bsh">
 <code class="devsite-terminal">sudo apt update</code>
-<code class="devsite-terminal">sudo apt install python3-dev python3-pip</code>
-<code class="devsite-terminal">sudo pip3 install -U virtualenv  # system-wide install</code>
+<code class="devsite-terminal">sudo apt install python3-dev python3-pip python3-venv</code>
 </pre>
 </section>
 
@@ -94,7 +92,6 @@ <h3>mac OS</h3>
 <code class="devsite-terminal">export PATH="/usr/local/bin:/usr/local/sbin:$PATH"</code>
 <code class="devsite-terminal">brew update</code>
 <code class="devsite-terminal">brew install python  # Python 3</code>
-<code class="devsite-terminal">sudo pip3 install -U virtualenv  # system-wide install</code>
 </pre>
 </section>
 
@@ -113,17 +110,15 @@ <h3>Windows</h3>
 </ol>
 <p>Make sure <a href="https://superuser.com/questions/1119883/windows-10-enable-ntfs-long-paths-policy-option-missing" class="external">long paths are enabled</a> on Windows.</p>
 <p>Install the <em>64-bit</em> <a href="https://www.python.org/downloads/windows/" class="external">Python 3 release for Windows</a> (select <code>pip</code> as an optional feature).</p>
-<pre class="devsite-terminal tfo-terminal-windows devsite-click-to-copy">pip3 install -U pip virtualenv</pre>
 </section>
 
 <section>
 <h3>Raspberry Pi</h3>
 <p>Requirements for the <a href="https://www.raspberrypi.org/downloads/raspbian/" class="external">Raspbian</a> operating system:</p>
 <pre class="prettyprint lang-bsh">
 <code class="devsite-terminal">sudo apt update</code>
-<code class="devsite-terminal">sudo apt install python3-dev python3-pip</code>
+<code class="devsite-terminal">sudo apt install python3-dev python3-pip python3-venv</code>
 <code class="devsite-terminal">sudo apt install libatlas-base-dev        # required for numpy</code>
-<code class="devsite-terminal">sudo pip3 install -U virtualenv           # system-wide install</code>
 </pre>
 </section>
 
@@ -132,7 +127,6 @@ <h3>Other</h3>
 <pre class="prettyprint lang-bsh">
 <code class="devsite-terminal">curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py</code>
 <code class="devsite-terminal">python get-pip.py</code>
-<code class="devsite-terminal">sudo pip3 install -U virtualenv  # system-wide install</code>
 </pre>
 </section>
 </div><!--/ds-selector-tabs-->
@@ -158,13 +152,16 @@ <h3>Ubuntu / mac OS</h3>
   Create a new virtual environment by choosing a Python interpreter and making a
   <code>./venv</code> directory to hold it:
 </p>
-<pre class="devsite-terminal devsite-click-to-copy">virtualenv --system-site-packages -p python3 <var>./venv</var></pre>
+<pre class="devsite-terminal devsite-click-to-copy">python3 -m venv --system-site-packages <var>./venv</var></pre>
 <p>
   Activate the virtual environment using a shell-specific command:
 </p>
-<pre class="devsite-terminal prettyprint lang-bsh">source <var>./venv</var>/bin/activate  # sh, bash, ksh, or zsh</pre>
+<pre class="devsite-terminal prettyprint lang-bsh">source <var>./venv</var>/bin/activate  # sh, bash, or zsh</pre>
+<pre class="devsite-terminal prettyprint lang-bsh">. <var>./venv</var>/bin/activate.fish  # fish</pre>
+<pre class="devsite-terminal prettyprint lang-bsh">source <var>./venv</var>/bin/activate.csh  # csh or tcsh</pre>
+
 <p>
-  When virtualenv is active, your shell prompt is prefixed with <code>(venv)</code>.
+  When the virtual environment is active, your shell prompt is prefixed with <code>(venv)</code>.
 </p>
 <p>
   Install packages within a virtual environment without affecting the host system
@@ -176,7 +173,7 @@ <h3>Ubuntu / mac OS</h3>
 <code class="devsite-terminal tfo-terminal-venv">pip list  # show packages installed within the virtual environment</code>
 </pre>
 <p>
-  And to exit virtualenv later:
+  And to exit the virtual environment later:
 </p>
 <pre class="devsite-terminal tfo-terminal-venv prettyprint lang-bsh">deactivate  # don't exit until you're done using TensorFlow</pre>
 </section>
@@ -188,7 +185,7 @@ <h3>Windows</h3>
   Create a new virtual environment by choosing a Python interpreter and making a
   <code>.\venv</code> directory to hold it:
 </p>
-<pre class="devsite-terminal tfo-terminal-windows devsite-click-to-copy">virtualenv --system-site-packages -p python3 <var>./venv</var></pre>
+<pre class="devsite-terminal tfo-terminal-windows devsite-click-to-copy">python -m venv --system-site-packages <var>.\venv</var></pre>
 <p>
   Activate the virtual environment:
 </p>
@@ -203,7 +200,7 @@ <h3>Windows</h3>
 <code class="devsite-terminal tfo-terminal-windows-venv">pip list  # show packages installed within the virtual environment</code>
 </pre>
 <p>
-  And to exit virtualenv later:
+  And to exit the virtual environment later:
 </p>
 <pre class="devsite-terminal tfo-terminal-windows-venv prettyprint lang-bsh">deactivate  # don't exit until you're done using TensorFlow</pre>
 </section>
@@ -240,7 +237,7 @@ <h2>3. Install the TensorFlow pip package</h2>
 
 <div class="ds-selector-tabs">
 <section>
-<h3>Virtualenv install</h3>
+<h3>Virtual environment install</h3>
 <pre class="devsite-terminal tfo-terminal-venv devsite-click-to-copy prettyprint lang-bsh">pip install --upgrade tensorflow</pre>
 <p>Verify the install:</p>
 <pre class="devsite-terminal tfo-terminal-venv devsite-click-to-copy prettyprint lang-bsh">python -c "import tensorflow as tf;print(tf.reduce_sum(tf.random.normal([1000, 1000])))"</pre>

site/en/r1/guide/premade_estimators.md

@@ -9,7 +9,7 @@ Prior to using the sample code in this document, you'll need to do the
 following:
 
 * [Install TensorFlow](../install).
-* If you installed TensorFlow with virtualenv or Anaconda, activate your
+* If you installed TensorFlow with venv or Anaconda, activate your
   TensorFlow environment.
 * Install or upgrade pandas by issuing the following command: