summaryrefslogtreecommitdiff
path: root/doc/source
diff options
context:
space:
mode:
Diffstat (limited to 'doc/source')
-rw-r--r--doc/source/dev/development_environment.rst7
-rw-r--r--doc/source/user/building.rst6
2 files changed, 7 insertions, 6 deletions
diff --git a/doc/source/dev/development_environment.rst b/doc/source/dev/development_environment.rst
index 0fb5a666d..baf8972cd 100644
--- a/doc/source/dev/development_environment.rst
+++ b/doc/source/dev/development_environment.rst
@@ -62,9 +62,10 @@ test and use your changes (in ``.py`` files), by simply restarting the
interpreter.
Note that another way to do an inplace build visible outside the repo base dir
-is with ``python setup.py develop``. This doesn't work for NumPy, because
-NumPy builds don't use ``setuptools`` by default. ``python setupegg.py
-develop`` will work though.
+is with ``python setup.py develop``. The difference is that this instead of
+adjusting ``PYTHONPATH``, this installs a ``.egg-link`` file into your
+site-packages as well as adjusts ``easy-install.pth`` there, so its a more
+permanent (and magical) operation.
Other build options
diff --git a/doc/source/user/building.rst b/doc/source/user/building.rst
index 8acb2fa3b..d6ca622f9 100644
--- a/doc/source/user/building.rst
+++ b/doc/source/user/building.rst
@@ -56,9 +56,9 @@ To perform an in-place build that can be run from the source folder run::
python setup.py build_ext --inplace
-The NumPy build system uses ``distutils`` and ``numpy.distutils``.
-``setuptools`` is only used when building via ``pip`` or with ``python
-setupegg.py``. Using ``virtualenv`` should work as expected.
+The NumPy build system uses ``setuptools`` (from numpy 1.11.0, before that it
+was plain ``distutils``) and ``numpy.distutils``.
+Using ``virtualenv`` should work as expected.
*Note: for build instructions to do development work on NumPy itself, see*
:ref:`development-environment`.