summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2016-04-12 06:43:38 -0700
committerSteve Piercy <web@stevepiercy.com>2016-04-12 06:43:38 -0700
commitd67566acebf890a603fad0e9069d5e131dfb5b31 (patch)
tree78e5994d2119b45461ea7c1ba924b8d000d7ac62 /docs/tutorials/wiki
parent654821decedd4f70e6de22e177b216f18524e609 (diff)
downloadpyramid-d67566acebf890a603fad0e9069d5e131dfb5b31.tar.gz
pyramid-d67566acebf890a603fad0e9069d5e131dfb5b31.tar.bz2
pyramid-d67566acebf890a603fad0e9069d5e131dfb5b31.zip
one does not simply "create a virtualenv". one should "create a virtual environment".
- Fixes #2483
Diffstat (limited to 'docs/tutorials/wiki')
-rw-r--r--docs/tutorials/wiki/distributing.rst4
-rw-r--r--docs/tutorials/wiki/installation.rst22
2 files changed, 13 insertions, 13 deletions
diff --git a/docs/tutorials/wiki/distributing.rst b/docs/tutorials/wiki/distributing.rst
index a7ea601ee..8bdf51021 100644
--- a/docs/tutorials/wiki/distributing.rst
+++ b/docs/tutorials/wiki/distributing.rst
@@ -7,8 +7,8 @@ Distributing Your Application
Once your application works properly, you can create a "tarball" from it by
using the ``setup.py sdist`` command. The following commands assume your
current working directory is the ``tutorial`` package we've created and that
-the parent directory of the ``tutorial`` package is a virtualenv representing
-a :app:`Pyramid` environment.
+the parent directory of the ``tutorial`` package is a virtual environment
+representing a :app:`Pyramid` environment.
On UNIX:
diff --git a/docs/tutorials/wiki/installation.rst b/docs/tutorials/wiki/installation.rst
index c50faa2e3..b1b89d117 100644
--- a/docs/tutorials/wiki/installation.rst
+++ b/docs/tutorials/wiki/installation.rst
@@ -12,8 +12,7 @@ This tutorial assumes that you have already followed the steps in
install Pyramid**. Thereby you will satisfy the following requirements.
* A Python interpreter is installed on your operating system.
-* :term:`virtualenv` is installed.
-* :term:`pip` will be installed when we create a virtual environment.
+* You've satisfied the :ref:`requirements-for-installing-packages`.
Create directory to contain the project
@@ -39,8 +38,8 @@ On Windows
Create and use a virtual Python environment
-------------------------------------------
-Next let's create a ``virtualenv`` workspace for our project. We will use the
-``VENV`` environment variable instead of the absolute path of the virtual
+Next let's create a virtual environment workspace for our project. We will use
+the ``VENV`` environment variable instead of the absolute path of the virtual
environment.
On UNIX
@@ -49,7 +48,7 @@ On UNIX
.. code-block:: bash
$ export VENV=~/pyramidtut
- $ virtualenv $VENV
+ $ python3 -m venv $VENV
On Windows
^^^^^^^^^^
@@ -71,7 +70,7 @@ Python 3.5:
.. code-block:: ps1con
- c:\> c:\Python35\Scripts\virtualenv %VENV%
+ c:\> c:\Python35\Scripts\python -m venv %VENV%
Upgrade ``pip`` and ``setuptools`` in the virtual environment
@@ -164,8 +163,9 @@ On Windows
.. note:: If you are using Windows, the ``zodb`` scaffold may not deal
gracefully with installation into a location that contains spaces in the
- path. If you experience startup problems, try putting both the virtualenv
- and the project into directories that do not contain spaces in their paths.
+ path. If you experience startup problems, try putting both the virtual
+ environment and the project into directories that do not contain spaces in
+ their paths.
.. _installing_project_in_dev_mode_zodb:
@@ -177,7 +177,7 @@ In order to do development on the project easily, you must "register" the
project as a development egg in your workspace using the ``pip install -e .``
command. In order to do so, change directory to the ``tutorial`` directory that
you created in :ref:`making_a_project`, and run the ``pip install -e .``
-command using the virtualenv Python interpreter.
+command using the virtual environment Python interpreter.
On UNIX
^^^^^^^
@@ -283,8 +283,8 @@ runs the tests in the same way that ``py.test`` does, but provides additional
"coverage" information, exposing which lines of your project are covered by the
tests.
-We've already installed the ``pytest-cov`` package into our ``virtualenv``, so
-we can run the tests with coverage.
+We've already installed the ``pytest-cov`` package into our virtual
+environment, so we can run the tests with coverage.
On UNIX
^^^^^^^