From 328a261c4fd30a9f66690d6c94bd9466a1abb66a Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Thu, 31 Mar 2016 09:37:57 -0400 Subject: [PATCH] Re-instated references to setuptools --- docs/dev/virtualenvs.rst | 6 +++--- docs/starting/install/osx.rst | 15 ++++++++++----- docs/starting/installation.rst | 5 ++--- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/docs/dev/virtualenvs.rst b/docs/dev/virtualenvs.rst index ee05a13..fa0bbfc 100644 --- a/docs/dev/virtualenvs.rst +++ b/docs/dev/virtualenvs.rst @@ -44,17 +44,17 @@ This creates a copy of Python in whichever directory you ran the command in, placing it in a folder named :file:`venv`. You can also use the Python interpreter of your choice (like -:file:`/usr/local/bin/python3`). +:file:`/usr/bin/python2.7`). .. code-block:: console - $ virtualenv -p /usr/local/bin/python3 venv + $ virtualenv -p /usr/bin/python2.7 venv or change the interpreter globally with an env variable in ``~/.bashrc``: .. code-block:: console - $ export VIRTUALENVWRAPPER_PYTHON=/usr/local/bin/python3 + $ export VIRTUALENVWRAPPER_PYTHON=/usr/bin/python2.7 2. To begin using the virtual environment, it needs to be activated: diff --git a/docs/starting/install/osx.rst b/docs/starting/install/osx.rst index ae3f10a..4ffba86 100644 --- a/docs/starting/install/osx.rst +++ b/docs/starting/install/osx.rst @@ -11,7 +11,7 @@ The latest version of Mac OS X, El Capitan, **comes with Python 2.7 out of the b You do not need to install or configure anything else to use Python. Having said that, I would strongly recommend that you install the tools and libraries described in the next section before you start building Python applications for -real-world use. In particular, you should always install ``pip``, as it makes +real-world use. In particular, you should always install Setuptools, as it makes it much easier for you to install and manage other third-party Python libraries. The version of Python that ships with OS X is great for learning but it's not @@ -40,7 +40,7 @@ package. commandline tools by running ``xcode-select --install`` on the terminal. While OS X comes with a large number of UNIX utilities, those familiar with -Linux systems will notice one key component missing: a package manager. +Linux systems will notice one key component missing: a decent package manager. `Homebrew `_ fills this void. To `install Homebrew `_, open :file:`Terminal` or @@ -69,13 +69,18 @@ Now, we can install Python 2.7: This will take a minute or two. -Pip +Setuptools and Pip ---------------- -Homebrew installs ``pip`` for you. +Homebrew installs Setuptools and ``pip`` for you. + +Setuptools enables you to download and install any compliant Python + -software over a network (usually the Internet) with a single command + -(``easy_install``). It also enables you to add this network installation + -capability to your own Python software with very little work. ``pip`` is a tool for easily installing and managing Python packages, that is -recommended over the deprecated ``easy_install``. It is superior to +recommended over ``easy_install``. It is superior to ``easy_install`` in `several ways `_, and is actively maintained. diff --git a/docs/starting/installation.rst b/docs/starting/installation.rst index 3c747bf..46b9fe4 100644 --- a/docs/starting/installation.rst +++ b/docs/starting/installation.rst @@ -7,17 +7,16 @@ If so, you do not need to install or configure anything else to use Python. Having said that, I would strongly recommend that you install the tools and libraries described in the guides below before you start building Python applications for real-world use. In particular, you should always install -Pip, and Virtualenv — they make it much easier for you to use +Setuptools, Pip, and Virtualenv — they make it much easier for you to use other third-party Python libraries. Installation Guides ------------------- These guides go over the proper installation of :ref:`Python ` -for development purposes, as well as pip and virtualenv. +for development purposes, as well as setuptools, pip and virtualenv. - :ref:`Python 3 on Mac OS X `. - - :ref:`Python 2 on Mac OS X `. - :ref:`Python 2 on Microsoft Windows `. - :ref:`Python 2 on Ubuntu Linux `.