kennethreitz/python-guide
1
0
Fork 0
mirror of https://github.com/kennethreitz/python-guide.git synced 2026-06-05 23:00:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #390 from ArtemPyanykh/remove-distribute

Browse Source 
Replace all references to Distribute with Setuptools.
This commit is contained in:
Kenneth Reitz
2014-03-31 10:28:32 -04:00
parent 89e32d1059 2d69455a2a
commit bc29d68433
5 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/shipping/freezing.rst
+2 -2
View File
@@ -46,7 +46,7 @@ Windows
bbFreeze bbFreeze
~~~~~~~~ ~~~~~~~~
Prerequisite is to install :ref:`Python, Distribute and pywin32 dependency on Windows <install-windows>`. Prerequisite is to install :ref:`Python, Setuptools and pywin32 dependency on Windows <install-windows>`.
.. todo:: Write steps for most basic .exe .. todo:: Write steps for most basic .exe
@@ -79,7 +79,7 @@ Prerequisite is to install :ref:`Python on Windows <install-windows>`.
PyInstaller PyInstaller
~~~~~~~~~~~ ~~~~~~~~~~~
Prerequisite is to have installed :ref:`Python, Distribute and pywin32 dependency on Windows <install-windows>`. Prerequisite is to have installed :ref:`Python, Setuptools and pywin32 dependency on Windows <install-windows>`.
- `Most basic tutorial <http://bojan-komazec.blogspot.com/2011/08/how-to-create-windows-executable-from.html>`_ - `Most basic tutorial <http://bojan-komazec.blogspot.com/2011/08/how-to-create-windows-executable-from.html>`_
- `Manual <http://www.pyinstaller.org/export/d3398dd79b68901ae1edd761f3fe0f4ff19cfb1a/project/doc/Manual.html?format=raw>`_ - `Manual <http://www.pyinstaller.org/export/d3398dd79b68901ae1edd761f3fe0f4ff19cfb1a/project/doc/Manual.html?format=raw>`_
docs/starting/install/linux.rst
+8 -8
View File
@@ -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 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 said that, I would strongly recommend that you install the tools and libraries
described in the next section before you start building Python applications 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. 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 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 download and install any compliant Python software product with a single
command. It also enables you to add this network installation capability to command. It also enables you to add this network installation capability to
your own Python software with very little work. your own Python software with very little work.
To obtain the latest version of Distribute for Linux, run the python script To obtain the latest version of Setuptools for Linux, refer to the documentation
available here: `python-distribute <http://python-distribute.org/distribute_setup.py>`_ available here: `unix-setuptools <https://pypi.python.org/pypi/setuptools#unix-wget>`_
The new``easy_install`` command you have available is considered by many to be 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 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 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 <http://pypi.python.org/pypi/virtualenv/>`_. Use pip `virtualenv <http://pypi.python.org/pypi/virtualenv/>`_. Use pip
.. code-block:: console .. code-block:: console
@@ -68,7 +68,7 @@ project's directory
.. code-block:: console .. code-block:: console
$ virtualenv --distribute venv $ virtualenv venv
To use an environment, run ``source venv/bin/activate``. Your command prompt 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 will change to show the active environment. Once you have finished working in
docs/starting/install/osx.rst
+9 -8
View File
@@ -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 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 said that, I would strongly recommend that you install the tools and libraries
described in the next section before you start building Python applications 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. 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. Yet, it's not The version of Python that ships with OS X is great for learning. Yet, it's not
@@ -65,25 +65,26 @@ new Python scripts directory to your ``PATH``
export PATH=/usr/local/share/python:$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 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 download and install any compliant Python software product with a single
command. It also enables you to add this network installation capability to command. It also enables you to add this network installation capability to
your own Python software with very little work. Homebrew already installed 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**. 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 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 <http://pypi.python.org/pypi/virtualenv/>`_. Use pip `virtualenv <http://pypi.python.org/pypi/virtualenv/>`_. Use pip
.. code-block:: console .. code-block:: console
@@ -103,7 +104,7 @@ the new environment.
.. code-block:: console .. code-block:: console
$ virtualenv --distribute venv $ virtualenv venv
To use an environment, run ``source venv/bin/activate``. Your command prompt 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 will change to show the active environment. Once you have finished working in
docs/starting/install/win.rst
+1 -1
View File
@@ -65,7 +65,7 @@ To install pip, run the python script available here:
Virtualenv 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 <http://pypi.python.org/pypi/virtualenv/>`_. Use pip `virtualenv <http://pypi.python.org/pypi/virtualenv/>`_. Use pip
.. code-block:: console .. code-block:: console
docs/starting/installation.rst
+2 -2
View File
@@ -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 Having said that, I would strongly recommend that you install the tools and
libraries described in the guides below before you start building Python libraries described in the guides below before you start building Python
applications for real-world use. In particular, you should always install 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. other third-party Python libraries.
Installation Guides Installation Guides
------------------- -------------------
These guides go over the proper installation of :ref:`Python 2.7 <which-python>` These guides go over the proper installation of :ref:`Python 2.7 <which-python>`
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 <install-osx>`. - :ref:`Mac OS X <install-osx>`.
- :ref:`Microsoft Windows<install-windows>`. - :ref:`Microsoft Windows<install-windows>`.