summaryrefslogtreecommitdiff
path: root/docs/intro
diff options
context:
space:
mode:
authorJon Dufresne <jon.dufresne@gmail.com>2020-05-29 04:50:04 -0700
committerCarlton Gibson <carlton.gibson@noumenal.es>2020-06-02 11:53:14 +0200
commitd7ee69d2f28da5f08dd8a261bb1f205187a2add2 (patch)
treed9aed625f4d79ca5ba7386f84a50e9ace4a7d64d /docs/intro
parentfe07357ef9678bfbe06c0552ef1f9ae7f22a8d3d (diff)
[3.1.x] Fixed #31643 -- Changed virtualenv doc references to Python 3 venv.
Backport of 9f4ceee90aaa2a6af8321417d79330f2fdc620ea from master
Diffstat (limited to 'docs/intro')
-rw-r--r--docs/intro/contributing.txt5
-rw-r--r--docs/intro/reusable-apps.txt16
2 files changed, 9 insertions, 12 deletions
diff --git a/docs/intro/contributing.txt b/docs/intro/contributing.txt
index 78d904440b..9612cd763e 100644
--- a/docs/intro/contributing.txt
+++ b/docs/intro/contributing.txt
@@ -152,8 +152,7 @@ If the ``source`` command is not available, you can try using a dot instead:
$ . ~/.virtualenvs/djangodev/bin/activate
You have to activate the virtual environment whenever you open a new
-terminal window. virtualenvwrapper__ is a useful tool for making this
-more convenient.
+terminal window.
.. admonition:: For Windows users
@@ -163,8 +162,6 @@ more convenient.
...\> %HOMEPATH%\.virtualenvs\djangodev\Scripts\activate.bat
-__ https://virtualenvwrapper.readthedocs.io/en/latest/
-
The name of the currently activated virtual environment is displayed on the
command line to help you keep track of which one you are using. Anything you
install through ``pip`` while this name is displayed will be installed in that
diff --git a/docs/intro/reusable-apps.txt b/docs/intro/reusable-apps.txt
index 3bc0188332..c326886803 100644
--- a/docs/intro/reusable-apps.txt
+++ b/docs/intro/reusable-apps.txt
@@ -277,8 +277,8 @@ working. We'll now fix this by installing our new ``django-polls`` package.
users of the machine.
Note that per-user installations can still affect the behavior of system
- tools that run as that user, so ``virtualenv`` is a more robust solution
- (see below).
+ tools that run as that user, so using a virtual environment is a more robust
+ solution (see below).
#. To install the package, use pip (you already :ref:`installed it
<installing-reusable-apps-prerequisites>`, right?)::
@@ -307,8 +307,8 @@ the world! If this wasn't just an example, you could now:
tutorial <https://packaging.python.org/tutorials/packaging-projects/#uploading-the-distribution-archives>`_
for doing this.
-Installing Python packages with virtualenv
-==========================================
+Installing Python packages with a virtual environment
+=====================================================
Earlier, we installed the polls app as a user library. This has some
disadvantages:
@@ -319,7 +319,7 @@ disadvantages:
the same name).
Typically, these situations only arise once you're maintaining several Django
-projects. When they do, the best solution is to use `virtualenv
-<https://virtualenv.pypa.io/>`_. This tool allows you to maintain multiple
-isolated Python environments, each with its own copy of the libraries and
-package namespace.
+projects. When they do, the best solution is to use :doc:`venv
+<python:tutorial/venv>`. This tool allows you to maintain multiple isolated
+Python environments, each with its own copy of the libraries and package
+namespace.