Skip to content

Commit d560f83

Browse files
committed
Merge pull request pypa#158 from prophile/patch-1
Remove wheel reference in tool recommendations
2 parents 70eb44d + 556cbe8 commit d560f83

File tree

1 file changed

+5
-13
lines changed

1 file changed

+5
-13
lines changed

source/current.rst

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@ Installation Tool Recommendations
2020
* Use :ref:`virtualenv`, or `pyvenv`_ to isolate application specific
2121
dependencies from a shared Python installation. [3]_
2222

23-
* Use `pip wheel
24-
<http://pip.pypa.io/en/latest/reference/pip_wheel.html>`_ to create a
25-
cache of :term:`wheel` distributions, for the purpose of speeding up
26-
subsequent installations. [4]_
27-
2823
* If you're looking for management of fully integrated cross-platform software
2924
stacks, consider :ref:`buildout` (primarily focused on the web development
3025
community) or :ref:`hashdist`, or :ref:`conda` (both primarily focused on
@@ -36,11 +31,11 @@ Packaging Tool Recommendations
3631
==============================
3732

3833
* Use :ref:`setuptools` to define projects and create :term:`Source Distributions
39-
<Source Distribution (or "sdist")>`. [5]_ [6]_
34+
<Source Distribution (or "sdist")>`. [4]_ [5]_
4035

4136
* Use the ``bdist_wheel`` :ref:`setuptools` extension available from the
4237
:ref:`wheel project <wheel>` to create :term:`wheels <Wheel>`. This is
43-
especially beneficial, if your project contains binary extensions. [7]_
38+
especially beneficial, if your project contains binary extensions. [6]_
4439

4540
* Use `twine <https://pypi.python.org/pypi/twine>`_ for uploading distributions
4641
to :term:`PyPI <Python Package Index (PyPI)>`.
@@ -64,10 +59,7 @@ Packaging Tool Recommendations
6459
:ref:`virtualenv`. However, using :ref:`virtualenv` will still be
6560
recommended for users that need cross-version consistency.
6661
67-
.. [4] For more information, see the pip guide to `Installing from Wheels
68-
<https://pip.pypa.io/en/latest/user_guide.html#installing-from-wheels>`_.
69-
70-
.. [5] Although you can use pure ``distutils`` for many projects, it does not
62+
.. [4] Although you can use pure ``distutils`` for many projects, it does not
7163
support defining dependencies on other projects and is missing several
7264
convenience utilities for automatically populating distribution metadata
7365
correctly that are provided by ``setuptools``. Being outside the
@@ -81,11 +73,11 @@ Packaging Tool Recommendations
8173
from a prebuilt :term:`wheel <Wheel>` file), it will actually build
8274
your project using :ref:`setuptools` instead.
8375
84-
.. [6] `distribute`_ (a fork of setuptools) was merged back into
76+
.. [5] `distribute`_ (a fork of setuptools) was merged back into
8577
:ref:`setuptools` in June 2013, thereby making setuptools the default
8678
choice for packaging.
8779
88-
.. [7] :term:`PyPI <Python Package Index (PyPI)>` currently only allows
80+
.. [6] :term:`PyPI <Python Package Index (PyPI)>` currently only allows
8981
uploading Windows and Mac OS X wheels, and they should be compatible with
9082
the binary installers provided for download from python.org. Enhancements
9183
will have to be made to the :ref:`wheel compatibility tagging scheme

0 commit comments

Comments
 (0)