Skip to content

Commit 2d69455

Browse files
artempyanykhartempyanykh
committed
Replace all references to Distribute with Setuptools.
Distribute was merged back into setuptools and discontinued.
1 parent 0dfc6e7 commit 2d69455

5 files changed

Lines changed: 22 additions & 21 deletions

File tree

‎docs/shipping/freezing.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Windows
4646
bbFreeze
4747
~~~~~~~~
4848

49-
Prerequisite is to install :ref:`Python, Distribute and pywin32 dependency on Windows <install-windows>`.
49+
Prerequisite is to install :ref:`Python, Setuptools and pywin32 dependency on Windows <install-windows>`.
5050

5151
.. todo:: Write steps for most basic .exe
5252

@@ -79,7 +79,7 @@ Prerequisite is to install :ref:`Python on Windows <install-windows>`.
7979
PyInstaller
8080
~~~~~~~~~~~
8181

82-
Prerequisite is to have installed :ref:`Python, Distribute and pywin32 dependency on Windows <install-windows>`.
82+
Prerequisite is to have installed :ref:`Python, Setuptools and pywin32 dependency on Windows <install-windows>`.
8383

8484
- `Most basic tutorial <http://bojan-komazec.blogspot.com/2011/08/how-to-create-windows-executable-from.html>`_
8585
- `Manual <http://www.pyinstaller.org/export/d3398dd79b68901ae1edd761f3fe0f4ff19cfb1a/project/doc/Manual.html?format=raw>`_

‎docs/starting/install/linux.rst‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,21 @@ side-by-side with the system's Python 2.4 installation.
1818
You do not need to install or configure anything else to use Python. Having
1919
said that, I would strongly recommend that you install the tools and libraries
2020
described in the next section before you start building Python applications
21-
for real-world use. In particular, you should always install Distribute, as
21+
for real-world use. In particular, you should always install Setuptools, as
2222
it makes it much easier for you to use other third-party Python libraries.
2323

24-
Distribute & Pip
24+
Setuptools & Pip
2525
----------------
2626

27-
The most crucial third-party Python software of all is Distribute, which
27+
The most crucial third-party Python software of all is Setuptools, which
2828
extends the packaging and installation facilities provided by the distutils
29-
in the standard library. Once you add Distribute to your Python system you can
29+
in the standard library. Once you add Setuptools to your Python system you can
3030
download and install any compliant Python software product with a single
3131
command. It also enables you to add this network installation capability to
3232
your own Python software with very little work.
3333

34-
To obtain the latest version of Distribute for Linux, run the python script
35-
available here: `python-distribute <http://python-distribute.org/distribute_setup.py>`_
34+
To obtain the latest version of Setuptools for Linux, refer to the documentation
35+
available here: `unix-setuptools <https://pypi.python.org/pypi/setuptools#unix-wget>`_
3636

3737
The new``easy_install`` command you have available is considered by many to be
3838
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
4848
Virtualenv
4949
----------
5050

51-
After Distribute & Pip, the next development tool that you should install is
51+
After Setuptools & Pip, the next development tool that you should install is
5252
`virtualenv <http://pypi.python.org/pypi/virtualenv/>`_. Use pip
5353

5454
.. code-block:: console
@@ -68,7 +68,7 @@ project's directory
6868

6969
.. code-block:: console
7070
71-
$ virtualenv --distribute venv
71+
$ virtualenv venv
7272
7373
To use an environment, run ``source venv/bin/activate``. Your command prompt
7474
will change to show the active environment. Once you have finished working in

‎docs/starting/install/osx.rst‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ The latest version of Mac OS X, Mavericks, **comes with Python 2.7 out of the bo
88
You do not need to install or configure anything else to use Python. Having
99
said that, I would strongly recommend that you install the tools and libraries
1010
described in the next section before you start building Python applications
11-
for real-world use. In particular, you should always install Distribute, as it
11+
for real-world use. In particular, you should always install Setuptools, as it
1212
makes it much easier for you to use other third-party Python libraries.
1313

1414
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``
6464
export PATH=/usr/local/share/python:$PATH
6565
6666
67-
Distribute & Pip
67+
Setuptools & Pip
6868
----------------
6969

70-
The most crucial third-party Python software of all is Distribute, which
70+
The most crucial third-party Python software of all is Setuptools, which
7171
extends the packaging and installation facilities provided by the distutils
72-
in the standard library. Once you add Distribute to your Python system you can
72+
in the standard library. Once you add Setuptools to your Python system you can
7373
download and install any compliant Python software product with a single
7474
command. It also enables you to add this network installation capability to
7575
your own Python software with very little work. Homebrew already installed
76-
Distribute for you.
76+
Setuptools for you.
7777

7878
Happily, when you ran `brew install python`, Homebrew also installed **pip**.
79-
Pip allows for uninstallation of packages, and is actively maintained.
79+
Pip allows for installation and uninstallation of packages, and is actively
80+
maintained.
8081

8182

8283
Virtualenv
8384
----------
8485

85-
After Distribute & Pip, the next development tool that you should install is
86+
After Setuptools & Pip, the next development tool that you should install is
8687
`virtualenv <http://pypi.python.org/pypi/virtualenv/>`_. Use pip
8788

8889
.. code-block:: console
@@ -102,7 +103,7 @@ the new environment.
102103

103104
.. code-block:: console
104105
105-
$ virtualenv --distribute venv
106+
$ virtualenv venv
106107
107108
To use an environment, run ``source venv/bin/activate``. Your command prompt
108109
will change to show the active environment. Once you have finished working in

‎docs/starting/install/win.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ To install pip, run the python script available here:
6565
Virtualenv
6666
----------
6767

68-
After Distribute & Pip, the next development tool that you should install is
68+
After Setuptools & Pip, the next development tool that you should install is
6969
`virtualenv <http://pypi.python.org/pypi/virtualenv/>`_. Use pip
7070

7171
.. code-block:: console

‎docs/starting/installation.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ If so, you do not need to install or configure anything else to use Python.
77
Having said that, I would strongly recommend that you install the tools and
88
libraries described in the guides below before you start building Python
99
applications for real-world use. In particular, you should always install
10-
Distribute, Pip, and Virtualenv — they make it much easier for you to use
10+
Setuptools, Pip, and Virtualenv — they make it much easier for you to use
1111
other third-party Python libraries.
1212

1313
Installation Guides
1414
-------------------
1515

1616
These guides go over the proper installation of :ref:`Python 2.7 <which-python>`
17-
for development purposes, as well as distribute, pip, and virtualenv setup.
17+
for development purposes, as well as setuptools, pip, and virtualenv setup.
1818

1919
- :ref:`Mac OS X <install-osx>`.
2020
- :ref:`Microsoft Windows<install-windows>`.

0 commit comments

Comments
 (0)