From 2d69455a2a03942b204f063f641abe7f762b17ac Mon Sep 17 00:00:00 2001 From: Artem Pyanykh Date: Tue, 25 Mar 2014 12:54:21 +0400 Subject: [PATCH] Replace all references to Distribute with Setuptools. Distribute was merged back into setuptools and discontinued. --- docs/shipping/freezing.rst | 4 ++-- docs/starting/install/linux.rst | 16 ++++++++-------- docs/starting/install/osx.rst | 17 +++++++++-------- docs/starting/install/win.rst | 2 +- docs/starting/installation.rst | 4 ++-- 5 files changed, 22 insertions(+), 21 deletions(-) diff --git a/docs/shipping/freezing.rst b/docs/shipping/freezing.rst index 2722c1250..f7b31042d 100644 --- a/docs/shipping/freezing.rst +++ b/docs/shipping/freezing.rst @@ -46,7 +46,7 @@ Windows bbFreeze ~~~~~~~~ -Prerequisite is to install :ref:`Python, Distribute and pywin32 dependency on Windows `. +Prerequisite is to install :ref:`Python, Setuptools and pywin32 dependency on Windows `. .. todo:: Write steps for most basic .exe @@ -79,7 +79,7 @@ Prerequisite is to install :ref:`Python on Windows `. PyInstaller ~~~~~~~~~~~ -Prerequisite is to have installed :ref:`Python, Distribute and pywin32 dependency on Windows `. +Prerequisite is to have installed :ref:`Python, Setuptools and pywin32 dependency on Windows `. - `Most basic tutorial `_ - `Manual `_ diff --git a/docs/starting/install/linux.rst b/docs/starting/install/linux.rst index 1fd04cba4..b2216aeea 100644 --- a/docs/starting/install/linux.rst +++ b/docs/starting/install/linux.rst @@ -18,21 +18,21 @@ side-by-side with the system's Python 2.4 installation. 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 Distribute, as +for real-world use. In particular, you should always install Setuptools, as it makes it much easier for you to use other third-party Python libraries. -Distribute & Pip +Setuptools & Pip ---------------- -The most crucial third-party Python software of all is Distribute, which +The most crucial third-party Python software of all is Setuptools, which extends the packaging and installation facilities provided by the distutils -in the standard library. Once you add Distribute to your Python system you can +in the standard library. Once you add Setuptools to your Python system you can download and install any compliant Python software product with a single command. It also enables you to add this network installation capability to your own Python software with very little work. -To obtain the latest version of Distribute for Linux, run the python script -available here: `python-distribute `_ +To obtain the latest version of Setuptools for Linux, refer to the documentation +available here: `unix-setuptools `_ The new``easy_install`` command you have available is considered by many to be deprecated, so we will install its replacement: **pip**. Pip allows for @@ -48,7 +48,7 @@ To install pip, simply open a command prompt and run Virtualenv ---------- -After Distribute & Pip, the next development tool that you should install is +After Setuptools & Pip, the next development tool that you should install is `virtualenv `_. Use pip .. code-block:: console @@ -68,7 +68,7 @@ project's directory .. code-block:: console - $ virtualenv --distribute venv + $ virtualenv venv To use an environment, run ``source venv/bin/activate``. Your command prompt will change to show the active environment. Once you have finished working in diff --git a/docs/starting/install/osx.rst b/docs/starting/install/osx.rst index e33cfd07e..082f7fbf3 100644 --- a/docs/starting/install/osx.rst +++ b/docs/starting/install/osx.rst @@ -8,7 +8,7 @@ The latest version of Mac OS X, Mavericks, **comes with Python 2.7 out of the bo 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 Distribute, as it +for real-world use. In particular, you should always install Setuptools, as it makes it much easier for you to use other third-party Python libraries. The version of Python that ships with OS X is great for learning, but it's not @@ -64,25 +64,26 @@ new Python scripts directory to your ``PATH`` export PATH=/usr/local/share/python:$PATH -Distribute & Pip +Setuptools & Pip ---------------- -The most crucial third-party Python software of all is Distribute, which +The most crucial third-party Python software of all is Setuptools, which extends the packaging and installation facilities provided by the distutils -in the standard library. Once you add Distribute to your Python system you can +in the standard library. Once you add Setuptools to your Python system you can download and install any compliant Python software product with a single command. It also enables you to add this network installation capability to your own Python software with very little work. Homebrew already installed -Distribute for you. +Setuptools for you. Happily, when you ran `brew install python`, Homebrew also installed **pip**. -Pip allows for uninstallation of packages, and is actively maintained. +Pip allows for installation and uninstallation of packages, and is actively +maintained. Virtualenv ---------- -After Distribute & Pip, the next development tool that you should install is +After Setuptools & Pip, the next development tool that you should install is `virtualenv `_. Use pip .. code-block:: console @@ -102,7 +103,7 @@ the new environment. .. code-block:: console - $ virtualenv --distribute venv + $ virtualenv venv To use an environment, run ``source venv/bin/activate``. Your command prompt will change to show the active environment. Once you have finished working in diff --git a/docs/starting/install/win.rst b/docs/starting/install/win.rst index b71b882ea..871e77b42 100644 --- a/docs/starting/install/win.rst +++ b/docs/starting/install/win.rst @@ -65,7 +65,7 @@ To install pip, run the python script available here: Virtualenv ---------- -After Distribute & Pip, the next development tool that you should install is +After Setuptools & Pip, the next development tool that you should install is `virtualenv `_. Use pip .. code-block:: console diff --git a/docs/starting/installation.rst b/docs/starting/installation.rst index 669817270..91de5a963 100644 --- a/docs/starting/installation.rst +++ b/docs/starting/installation.rst @@ -7,14 +7,14 @@ 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 -Distribute, 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 2.7 ` - for development purposes, as well as distribute, pip, and virtualenv setup. + for development purposes, as well as setuptools, pip, and virtualenv setup. - :ref:`Mac OS X `. - :ref:`Microsoft Windows`.