Change to code-block:: text from code-block:: bash & update the version of pip (#937)

dukecat0 · bhrutledge · web-flow · commit a95d0b12b2d7 · 2021-07-12T05:42:17.000-04:00
* Change to `text` from `bash` &amp; update the version of pip

* Remove `messages.pot` from this PR

* Update source/guides/installing-using-pip-and-virtual-environments.rst

Co-authored-by: Brian Rutledge &lt;brian@bhrutledge.com&gt;

* separate the command from its output

* Split which/where output

* Rework installing pip section

* Use bat for Windows input

* Use bash for Unix input

Co-authored-by: Brian Rutledge &lt;brian@bhrutledge.com&gt;
diff --git a/source/guides/distributing-packages-using-setuptools.rst b/source/guides/distributing-packages-using-setuptools.rst
@@ -36,7 +36,7 @@ Requirements for packaging and distributing
 
     .. tab:: Windows
 
-        .. code-block:: bash
+        .. code-block:: bat
 
             py -m pip install twine
 
@@ -728,7 +728,7 @@ Before you can build wheels and sdists for your project, you'll need to install
 
 .. tab:: Windows
 
-    .. code-block:: bash
+    .. code-block:: bat
 
         py -m pip install build
 
@@ -747,7 +747,7 @@ Minimally, you should create a :term:`Source Distribution <Source Distribution (
 
 .. tab:: Windows
 
-    .. code-block:: bash
+    .. code-block:: bat
 
         py -m build --sdist
 
@@ -804,7 +804,7 @@ To build the wheel:
 
 .. tab:: Windows
 
-    .. code-block:: bash
+    .. code-block:: bat
 
         py -m build --wheel
 
@@ -833,7 +833,7 @@ To build the wheel:
 
 .. tab:: Windows
 
-    .. code-block:: bash
+    .. code-block:: bat
 
         py -m build --wheel
 
@@ -930,7 +930,7 @@ it will be automatically created when the first release is uploaded.
 For the second and subsequent releases, PyPI only requires that the
 version number of the new release differ from any previous releases.
 
-.. code-block:: text
+.. code-block:: bash
 
     twine upload dist/*
 
diff --git a/source/guides/dropping-older-python-versions.rst b/source/guides/dropping-older-python-versions.rst
@@ -67,7 +67,7 @@ Steps:
 
 .. tab:: Windows
 
-    .. code-block:: bash
+    .. code-block:: bat
 
         py -m pip install  --upgrade setuptools twine
 
diff --git a/source/guides/hosting-your-own-index.rst b/source/guides/hosting-your-own-index.rst
@@ -22,7 +22,7 @@ description to configure their installer appropriately. For example with pip:
 
 .. tab:: Windows
 
-    .. code-block:: bash
+    .. code-block:: bat
 
         py -m pip install --extra-index-url https://python.example.com/ foobar
 
diff --git a/source/guides/installing-using-pip-and-virtual-environments.rst b/source/guides/installing-using-pip-and-virtual-environments.rst
@@ -21,8 +21,8 @@ installed.
 
 .. tab:: Unix/macOS
 
-    Debian and most other distributions include a `python-pip`_ package, if you
-    want to use the Linux distribution-provided versions of pip see
+    Debian and most other distributions include a `python-pip`_ package; if you
+    want to use the Linux distribution-provided versions of pip, see
     :doc:`/guides/installing-using-linux-tools`.
 
     You can also install pip yourself to ensure you have the latest version. It's
@@ -32,30 +32,34 @@ installed.
 
         python3 -m pip install --user --upgrade pip
 
-    Afterwards, you should have the newest pip installed in your user site:
+        python3 -m pip --version
 
-    .. code-block:: bash
+    Afterwards, you should have the latest version of pip installed in your
+    user site:
 
-        python3 -m pip --version
-        pip 9.0.1 from $HOME/.local/lib/python3.6/site-packages (python 3.6)
+    .. code-block:: text
+
+        pip 21.1.3 from $HOME/.local/lib/python3.9/site-packages (python 3.9)
 
     .. _python-pip: https://packages.debian.org/stable/python-pip
 
 .. tab:: Windows
 
-    The Python installers for Windows include pip. You should be able to access
-    pip using:
+    The Python installers for Windows include pip. You can make sure that pip is
+    up-to-date by running:
 
-    .. code-block:: bash
+    .. code-block:: bat
+
+        py -m pip install --upgrade pip
 
         py -m pip --version
-        pip 9.0.1 from c:\python36\lib\site-packages (Python 3.6.1)
 
-    You can make sure that pip is up-to-date by running:
+    Afterwards, you should have the latest version of pip:
 
-    .. code-block:: bash
+    .. code-block:: text
+
+        pip 21.1.3 from c:\python39\lib\site-packages (Python 3.9.4)
 
-        py -m pip install --upgrade pip
 
 
 Installing virtualenv
@@ -81,7 +85,7 @@ using pip.
 
 .. tab:: Windows
 
-    .. code-block:: bash
+    .. code-block:: bat
 
         py -m pip install --user virtualenv
 
@@ -111,7 +115,7 @@ in the below commands.
 
 .. tab:: Windows
 
-    .. code-block:: bash
+    .. code-block:: bat
 
         py -m venv env
 
@@ -140,27 +144,40 @@ virtual environment-specific
 
 .. tab:: Windows
 
-    .. code-block:: text
+    .. code-block:: bat
 
         .\env\Scripts\activate
 
 You can confirm you're in the virtual environment by checking the location of your
-Python interpreter, it should point to the ``env`` directory.
+Python interpreter:
 
 .. tab:: Unix/macOS
 
     .. code-block:: bash
 
         which python
-        .../env/bin/python
 
 .. tab:: Windows
 
-    .. code-block:: text
+    .. code-block:: bat
 
         where python
+    
+It should be in the ``env`` directory:
+
+.. tab:: Unix/macOS
+
+    .. code-block:: bash
+
+        .../env/bin/python
+
+.. tab:: Windows
+
+    .. code-block:: bat
+        
         ...\env\Scripts\python.exe
 
+
 As long as your virtual environment is activated pip will install packages into that
 specific environment and you'll be able to import and use packages in your
 Python application.
@@ -193,7 +210,7 @@ Now that you're in your virtual environment you can install packages. Let's inst
 
 .. tab:: Windows
 
-    .. code-block:: bash
+    .. code-block:: bat
 
         py -m pip install requests
 
@@ -232,7 +249,7 @@ a specific version of ``requests``:
 
 .. tab:: Windows
 
-    .. code-block:: bash
+    .. code-block:: bat
 
         py -m pip install requests==2.18.4
 
@@ -246,7 +263,7 @@ To install the latest ``2.x`` release of requests:
 
 .. tab:: Windows
 
-    .. code-block:: bash
+    .. code-block:: bat
 
         py -m pip install requests>=2.0.0,<3.0.0
 
@@ -260,7 +277,7 @@ To install pre-release versions of packages, use the ``--pre`` flag:
 
 .. tab:: Windows
 
-    .. code-block:: bash
+    .. code-block:: bat
 
         py -m pip install --pre requests
 
@@ -279,7 +296,7 @@ specifying the extra in brackets:
 
 .. tab:: Windows
 
-    .. code-block:: bash
+    .. code-block:: bat
 
         py -m pip install requests[security]
 
@@ -301,7 +318,7 @@ pip can install a package directly from source, for example:
 
 .. tab:: Windows
 
-    .. code-block:: bash
+    .. code-block:: bat
 
         cd google-auth
         py -m pip install .
@@ -318,7 +335,7 @@ installed package without needing to re-install:
 
 .. tab:: Windows
 
-    .. code-block:: bash
+    .. code-block:: bat
 
         py -m pip install --editable .
 
@@ -354,7 +371,7 @@ wheel, or tar file) you can install it directly with pip:
 
 .. tab:: Windows
 
-    .. code-block:: bash
+    .. code-block:: bat
 
         py -m pip install requests-2.18.4.tar.gz
 
@@ -370,7 +387,7 @@ pip to look for packages there and not to use the
 
 .. tab:: Windows
 
-    .. code-block:: bash
+    .. code-block:: bat
 
         py -m pip install --no-index --find-links=/local/dir/ requests
 
@@ -393,7 +410,7 @@ If you want to download packages from a different index than the
 
 .. tab:: Windows
 
-    .. code-block:: bash
+    .. code-block:: bat
 
         py -m pip install --index-url http://index.example.com/simple/ SomeProject
 
@@ -409,7 +426,7 @@ and a separate index, you can use the ``--extra-index-url`` flag instead:
 
 .. tab:: Windows
 
-    .. code-block:: bash
+    .. code-block:: bat
 
         py -m pip install --extra-index-url http://index.example.com/simple/ SomeProject
 
@@ -427,7 +444,7 @@ install the latest version of ``requests`` and all of its dependencies:
 
 .. tab:: Windows
 
-    .. code-block:: bash
+    .. code-block:: bat
 
         py -m pip install --upgrade requests
 
@@ -453,7 +470,7 @@ And tell pip to install all of the packages in this file using the ``-r`` flag:
 
 .. tab:: Windows
 
-    .. code-block:: bash
+    .. code-block:: bat
 
         py -m pip install -r requirements.txt
 
@@ -471,7 +488,7 @@ Pip can export a list of all installed packages and their versions using the
 
 .. tab:: Windows
 
-    .. code-block:: bash
+    .. code-block:: bat
 
         py -m pip freeze
 
diff --git a/source/guides/making-a-pypi-friendly-readme.rst b/source/guides/making-a-pypi-friendly-readme.rst
@@ -53,7 +53,7 @@ such as ``text/plain``, ``text/x-rst`` (for reStructuredText), or ``text/markdow
 
    .. tab:: Windows
 
-      .. code-block:: bash
+      .. code-block:: bat
 
          py -m pip install --user --upgrade setuptools wheel twine
 
@@ -115,7 +115,7 @@ You can check your README for markup errors before uploading as follows:
 
    .. tab:: Windows
 
-      .. code-block:: bash
+      .. code-block:: bat
 
             py -m pip install --upgrade twine
 
diff --git a/source/guides/using-testpypi.rst b/source/guides/using-testpypi.rst
@@ -49,7 +49,7 @@ specifying the ``--index-url`` flag
 
 .. tab:: Windows
 
-    .. code-block:: bash
+    .. code-block:: bat
 
         py -m pip install --index-url https://test.pypi.org/simple/ your-package
 
@@ -65,7 +65,7 @@ you're testing has dependencies:
 
 .. tab:: Windows
 
-    .. code-block:: bash
+    .. code-block:: bat
 
         py -m pip install --index-url https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple your-package
 
diff --git a/source/tutorials/creating-documentation.rst b/source/tutorials/creating-documentation.rst
@@ -21,7 +21,7 @@ Use ``pip`` to install Sphinx:
 
 .. tab:: Windows
 
-    .. code-block:: bash
+    .. code-block:: bat
 
         py -m pip install -U sphinx
 
diff --git a/source/tutorials/installing-packages.rst b/source/tutorials/installing-packages.rst
diff --git a/source/tutorials/managing-dependencies.rst b/source/tutorials/managing-dependencies.rst
diff --git a/source/tutorials/packaging-projects.rst b/source/tutorials/packaging-projects.rst
