BUG: fix TravisCI test issues when using setuptools unconditionally.

Also remove all mentions of setupegg.py from the documentation.

.travis.yml

@@ -48,6 +48,7 @@ matrix:
             - python3-dbg
             - python3-dev
             - python3-nose
+            - python3-setuptools
     - python: 2.7
       env: NPY_RELAXED_STRIDES_CHECKING=0 PYTHON_OO=1
     - python: 3.5

MANIFEST.in

@@ -5,7 +5,6 @@
 #
 include MANIFEST.in
 include *.txt
-include setupegg.py
 include site.cfg.example
 include numpy/random/mtrand/generate_mtrand_c.py
 recursive-include numpy/random/mtrand *.pyx *.pxd

doc/HOWTO_BUILD_DOCS.rst.txt

@@ -36,9 +36,7 @@ that the correct version is imported by
     >>> import numpy
 
 Note that you can eg. install Numpy to a temporary location and set
-the PYTHONPATH environment variable appropriately. Also note that if
-you have a system Numpy installed via Python eggs, you will also need
-to use ``setupegg.py`` to install the temporary Numpy.
+the PYTHONPATH environment variable appropriately.
 
 After Numpy is installed, write::
 

doc/Makefile

@@ -82,7 +82,7 @@ real-dist: dist-build html html-scipyorg
 
 dist-build:
 	rm -f ../dist/*.egg
-	cd .. && $(PYTHON) setupegg.py bdist_egg
+	cd .. && $(PYTHON) setup.py bdist_egg
 	install -d $(subst :, ,$(INSTALL_PPH))
 	$(PYTHON) `which easy_install` --prefix=$(INSTALL_DIR) ../dist/*.egg
 

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

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`.

pavement.py

@@ -18,7 +18,7 @@
     paver bootstrap && source bootstrap/bin/activate
     # Installing numpy is necessary to build the correct documentation (because
     # of autodoc)
-    python setupegg.py install
+    python setup.py install
     paver dmg
 
 Building a simple (no-superpack) windows installer from wine
@@ -440,7 +440,7 @@ def _build_mpkg(pyver):
         ldflags = "-undefined dynamic_lookup -bundle -arch i386 -arch ppc -Wl,-search_paths_first"
 
     ldflags += " -L%s" % os.path.join(os.path.dirname(__file__), "build")
-    sh("LDFLAGS='%s' %s setupegg.py bdist_mpkg" % (ldflags, " ".join(MPKG_PYTHON[pyver])))
+    sh("LDFLAGS='%s' %s setup.py bdist_mpkg" % (ldflags, " ".join(MPKG_PYTHON[pyver])))
 
 @task
 def simple_dmg():

tools/travis-test.sh

@@ -132,6 +132,7 @@ run_test()
 
 export PYTHON
 export PIP
+$PIP install setuptools
 if [ -n "$USE_WHEEL" ] && [ $# -eq 0 ]; then
   # Build wheel
   $PIP install wheel