Merge pull request pypa#247 from stevepiercy/master

use venv instead of pyvenv

Author: ncoghlan

source/current.rst

@@ -5,7 +5,7 @@ Tool Recommendations
 ====================
 
 :Page Status: Complete
-:Last Reviewed: 2015-08-31
+:Last Reviewed: 2016-06-24
 
 If you're familiar with Python packaging and installation, and just want to know
 what tools are currently recommended, then here it is.
@@ -19,7 +19,7 @@ Installation Tool Recommendations
   is installed, you may need to also install :ref:`wheel` to get the benefit
   of wheel caching. [3]_
 
-* Use :ref:`virtualenv`, or `pyvenv`_ to isolate application specific
+* Use :ref:`virtualenv`, or `venv`_ to isolate application specific
   dependencies from a shared Python installation. [4]_
 
 * If you're looking for management of fully integrated cross-platform software
@@ -56,11 +56,11 @@ Packaging Tool Recommendations
        as for why pip was chosen.
 
 .. [3] :ref:`get-pip.py <pip:get-pip>` and :ref:`virtualenv` install
-       :ref:`wheel`, whereas :ref:`ensurepip` and :ref:`pyvenv <venv>` do not
+       :ref:`wheel`, whereas :ref:`ensurepip` and :ref:`venv <venv>` do not
        currently.  Also, the common "python-pip" package that's found in various
        linux distros, does not depend on "python-wheel" currently.
 
-.. [4] Beginning with Python 3.4, ``pyvenv`` will create virtualenv environments
+.. [4] Beginning with Python 3.4, ``venv`` will create virtualenv environments
        with ``pip`` installed, thereby making it an equal alternative to
        :ref:`virtualenv`. However, using :ref:`virtualenv` will still be
        recommended for users that need cross-version consistency.
@@ -90,4 +90,4 @@ Packaging Tool Recommendations
        <425>` before linux wheels will be allowed.
 
 .. _distribute: https://pypi.python.org/pypi/distribute
-.. _pyvenv: http://docs.python.org/3.4/library/venv.html
+.. _venv: https://docs.python.org/3/library/venv.html

source/installing.rst

@@ -3,7 +3,7 @@ Installing Packages
 ===================
 
 :Page Status: Complete
-:Last Reviewed: 2015-09-09
+:Last Reviewed: 2016-06-24
 
 This section covers the basics of how to install Python :term:`packages
 <Distribution Package>`.
@@ -86,11 +86,11 @@ but here's the basic commands:
     virtualenv <DIR>
     source <DIR>/bin/activate
 
-   Using `pyvenv`_: [3]_
+   Using `venv`_: [3]_
 
    ::
 
-    pyvenv <DIR>
+    python3 -m venv <DIR>
     source <DIR>/bin/activate
 
 
@@ -122,7 +122,7 @@ environments.
 
 Currently, there are two viable tools for creating Python virtual environments:
 
-* `pyvenv`_ is available by default in Python 3.3 and later, and installs
+* `venv`_ is available by default in Python 3.3 and later, and installs
   :ref:`pip` and :ref:`setuptools` into created virtual environments in
   Python 3.4 and later.
 * :ref:`virtualenv` needs to be installed separately, but supports Python 2.6+
@@ -140,16 +140,16 @@ Using :ref:`virtualenv`:
  source <DIR>/bin/activate
 
 
-Using `pyvenv`_:
+Using `venv`_:
 
 ::
 
- pyvenv <DIR>
+ python3 -m venv <DIR>
  source <DIR>/bin/activate
 
 
 For more information, see the `virtualenv <http://virtualenv.pypa.io>`_ docs or
-the `pyvenv`_ docs.
+the `venv`_ docs.
 
 
 Use pip for Installing
@@ -374,7 +374,7 @@ Install `setuptools extras`_.
        installs the default behavior
        <https://github.com/pypa/pip/issues/1668>`_.
 
-.. [3] Beginning with Python 3.4, ``pyvenv`` (a stdlib alternative to
+.. [3] Beginning with Python 3.4, ``venv`` (a stdlib alternative to
        :ref:`virtualenv`) will create virtualenv environments with ``pip``
        pre-installed, thereby making it an equal alternative to
        :ref:`virtualenv`.
@@ -383,5 +383,5 @@ Install `setuptools extras`_.
        and support was released in :ref:`setuptools` v8.0 and
        :ref:`pip` v6.0
 
-.. _pyvenv: http://docs.python.org/3.4/library/venv.html
-.. _setuptools extras: http://packages.python.org/setuptools/setuptools.html#declaring-extras-optional-features-with-their-own-dependencies
+.. _venv: https://docs.python.org/3/library/venv.html
+.. _setuptools extras: http://setuptools.readthedocs.io/en/latest/setuptools.html#declaring-extras-optional-features-with-their-own-dependencies

source/projects.rst

@@ -6,7 +6,7 @@ Project Summaries
 =================
 
 :Page Status: Complete
-:Last Reviewed: 2015-09-08
+:Last Reviewed: 2016-06-24
 
 Summaries and links for the most relevant projects in the space of Python
 installation and packaging.
@@ -35,7 +35,7 @@ complete mirror of the contents of PyPI.
 distlib
 =======
 
-`Docs <http://pythonhosted.org/distlib>`__ |
+`Docs <http://pythonhosted.org/distlib/>`__ |
 `Mailing list <http://mail.python.org/mailman/listinfo/distutils-sig>`__ [2]_ |
 `Issues <https://bitbucket.org/pypa/distlib/issues?status=new&status=open>`__ |
 `Bitbucket <https://bitbucket.org/pypa/distlib>`__ |
@@ -68,7 +68,7 @@ Core utilities for Python packaging used by :ref:`pip` and :ref:`setuptools`.
 pip
 ===
 
-`Docs <https://pip.pypa.io>`__ |
+`Docs <https://pip.pypa.io/en/stable/>`__ |
 `User list <http://groups.google.com/group/python-virtualenv>`__ [1]_ |
 `Dev list <http://groups.google.com/group/pypa-dev>`__ |
 `Issues <https://github.com/pypa/pip/issues>`__ |
@@ -83,7 +83,7 @@ A tool for installing Python packages.
 Python Packaging User Guide
 ===========================
 
-`Docs <http://packaging.python.org>`__ |
+`Docs <https://packaging.python.org/en/latest/>`__ |
 `Mailing list <http://mail.python.org/mailman/listinfo/distutils-sig>`__ |
 `Issues <https://github.com/pypa/python-packaging-user-guide/issues>`__ |
 `Github <https://github.com/pypa/python-packaging-user-guide>`__ |
@@ -99,7 +99,7 @@ This guide!
 setuptools
 ==========
 
-`Docs <https://setuptools.readthedocs.io>`__ |
+`Docs <https://setuptools.readthedocs.io/en/latest/>`__ |
 `User list <http://mail.python.org/mailman/listinfo/distutils-sig>`__ [2]_ |
 `Dev list <http://groups.google.com/group/pypa-dev>`__ |
 `Issues <https://bitbucket.org/pypa/setuptools/issues>`__ |
@@ -137,7 +137,7 @@ Twine is a utility for interacting with PyPI, that offers a secure replacement f
 virtualenv
 ==========
 
-`Docs <https://virtualenv.pypa.io>`__ |
+`Docs <https://virtualenv.pypa.io/en/stable/>`__ |
 `User list <http://groups.google.com/group/python-virtualenv>`__ |
 `Dev list <http://groups.google.com/group/pypa-dev>`__ |
 `Issues <https://github.com/pypa/virtualenv/issues>`__ |
@@ -154,7 +154,7 @@ A tool for creating isolated Python environments.
 Warehouse
 =========
 
-`Docs <http://warehouse.readthedocs.org/en/latest/>`__ |
+`Docs <https://warehouse.pypa.io/>`__ |
 `Mailing list <http://mail.python.org/mailman/listinfo/distutils-sig>`__ [2]_ |
 `Issues <https://github.com/pypa/warehouse/issues>`__ |
 `Github <https://github.com/pypa/warehouse>`__ |
@@ -169,7 +169,7 @@ The new unreleased PyPI application which can be previewed at https://warehouse.
 wheel
 =====
 
-`Docs <http://wheel.readthedocs.org>`__ |
+`Docs <http://wheel.readthedocs.io/en/latest/>`__ |
 `Mailing list <http://mail.python.org/mailman/listinfo/distutils-sig>`__ [2]_ |
 `Issues <https://bitbucket.org/pypa/wheel/issues?status=new&status=open>`__ |
 `Bitbucket <https://bitbucket.org/pypa/wheel>`__ |
@@ -206,7 +206,7 @@ reproducibility, extensibility and simplicity (in that order).
 buildout
 ========
 
-`Docs <http://www.buildout.org>`__ |
+`Docs <http://www.buildout.org/en/latest/>`__ |
 `Mailing list <http://mail.python.org/mailman/listinfo/distutils-sig>`__ [2]_ |
 `Issues <https://bugs.launchpad.net/zc.buildout>`__ |
 `PyPI <https://pypi.python.org/pypi/zc.buildout>`__ |
@@ -221,7 +221,7 @@ lets you create a buildout configuration and reproduce the same software later.
 conda
 =====
 
-`Docs <http://docs.continuum.io/conda/index.html>`__
+`Docs <http://conda.pydata.org/docs/>`__
 
 conda is the package management tool for `Anaconda
 <http://docs.continuum.io/anaconda/index.html>`__ Python installations.
@@ -244,7 +244,7 @@ for managing distributions from PyPI.
 devpi
 =====
 
-`Docs <http://doc.devpi.net>`__ |
+`Docs <http://doc.devpi.net/latest/>`__ |
 `Mailing List <https://groups.google.com/forum/#!forum/devpi-dev>`__ |
 `Issues <https://bitbucket.org/hpk42/devpi/issues>`__ |
 `PyPI <https://pypi.python.org/pypi/devpi>`__
@@ -304,7 +304,7 @@ build of the Python distribution.
 distutils
 =========
 
-`Docs <https://docs.python.org/3/library/distutils.html#module-distutils>`__ |
+`Docs <https://docs.python.org/3/library/distutils.html>`__ |
 `User list <http://mail.python.org/mailman/listinfo/distutils-sig>`__ [2]_ |
 `Issues <http://bugs.python.org>`__ |
 User irc:#pypa  |
@@ -324,10 +324,9 @@ venv
 `Docs <https://docs.python.org/3/library/venv.html>`__ |
 `Issues <http://bugs.python.org>`__
 
-A package in the Python Standard Library (starting with Python 3.3) that
-includes the ``pyvenv`` tool for creating :term:`Virtual Environments <Virtual
-Environment>`.  For more information, see the section on :ref:`Creating and
-using Virtual Environments`.
+A package in the Python Standard Library (starting with Python 3.3) for
+creating :term:`Virtual Environments <Virtual Environment>`.  For more
+information, see the section on :ref:`Creating and using Virtual Environments`.
 
 
 ----