remove the duplicate "PyPI mirrors and caches" sections

Author: qwcode

source/deployment.rst

@@ -8,65 +8,6 @@ Development & Deployment
 
 .. contents::
 
-.. _`PyPI mirrors and caches`:
-
-PyPI mirrors and caches
-=======================
-
-Mirroring or caching of PyPI can be used to speed up local package
-installation, allow offline work, handle corporate firewalls or just plain
-Internet flakiness.
-
-Three options are available in this area:
-
-1. pip provides local caching options,
-2. devpi provides higher-level caching option, potentially shared amongst
-   many users or machines, and
-3. bandersnatch provides a local complete mirror of all packages on PyPI.
-
-
-Caching with pip
-----------------
-
-pip provides a number of facilities for speeding up installation by using
-local cached copies of packages:
-
-1. `Fast & local installs
-   <https://pip.pypa.io/en/latest/user_guide.html#fast-local-installs>`_ by
-   downloading all the requirements for a project and then pointing pip at
-   those downloaded files instead of going to PyPI.
-2. A variation on the above which pre-builds the installation files for
-   the requirements using `pip wheel
-   <http://pip.readthedocs.org/en/latest/reference/pip_wheel.html>`_::
-
-    $ pip wheel --wheel-dir=/tmp/wheelhouse SomePackage
-    $ pip install --no-index --find-links=/tmp/wheelhouse SomePackage
-
-
-Caching with devpi
-------------------
-
-devpi is a caching proxy server which you run on your laptop, or some other
-machine you know will always be available to you. See the `devpi
-documentation for getting started`__.
-
-__ http://doc.devpi.net/latest/quickstart-pypimirror.html
-
-
-Complete mirror with bandersnatch
-----------------------------------
-
-bandersnatch will set up a complete local mirror of all packages on PyPI
-(externally-hosted packages are not mirrored). See the
-`bandersnatch documentation for getting that going`__.
-
-__ https://bitbucket.org/pypa/bandersnatch/overview
-
-A benefit of devpi is that it will create a mirror which includes packages
-that are external to PyPI, unlike bandersnatch which will only cache packages
-hosted on PyPI.
-
-
 
 .. _`Supporting multiple Python versions`:
 
@@ -208,12 +149,58 @@ There are a few techniques to store the version in your project code without dup
 PyPI mirrors and caches
 =======================
 
-::
+Mirroring or caching of PyPI can be used to speed up local package
+installation, allow offline work, handle corporate firewalls or just plain
+Internet flakiness.
 
-  FIXME
+Three options are available in this area:
+
+1. pip provides local caching options,
+2. devpi provides higher-level caching option, potentially shared amongst
+   many users or machines, and
+3. bandersnatch provides a local complete mirror of all packages on PyPI.
 
-  - local --find-links
-  - tools like https://pypi.python.org/pypi/devpi-server
+
+Caching with pip
+----------------
+
+pip provides a number of facilities for speeding up installation by using
+local cached copies of packages:
+
+1. `Fast & local installs
+   <https://pip.pypa.io/en/latest/user_guide.html#fast-local-installs>`_ by
+   downloading all the requirements for a project and then pointing pip at
+   those downloaded files instead of going to PyPI.
+2. A variation on the above which pre-builds the installation files for
+   the requirements using `pip wheel
+   <http://pip.readthedocs.org/en/latest/reference/pip_wheel.html>`_::
+
+    $ pip wheel --wheel-dir=/tmp/wheelhouse SomePackage
+    $ pip install --no-index --find-links=/tmp/wheelhouse SomePackage
+
+
+Caching with devpi
+------------------
+
+devpi is a caching proxy server which you run on your laptop, or some other
+machine you know will always be available to you. See the `devpi
+documentation for getting started`__.
+
+__ http://doc.devpi.net/latest/quickstart-pypimirror.html
+
+
+Complete mirror with bandersnatch
+----------------------------------
+
+bandersnatch will set up a complete local mirror of all packages on PyPI
+(externally-hosted packages are not mirrored). See the
+`bandersnatch documentation for getting that going`__.
+
+__ https://bitbucket.org/pypa/bandersnatch/overview
+
+A benefit of devpi is that it will create a mirror which includes packages
+that are external to PyPI, unlike bandersnatch which will only cache packages
+hosted on PyPI.
 
 
 .. _`Patching & Forking`: