diff options
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | MANIFEST.in | 1 | ||||
| -rw-r--r-- | doc/HOWTO_BUILD_DOCS.rst.txt | 4 | ||||
| -rw-r--r-- | doc/Makefile | 2 | ||||
| -rw-r--r-- | doc/source/dev/development_environment.rst | 7 | ||||
| -rw-r--r-- | doc/source/user/building.rst | 6 | ||||
| -rw-r--r-- | pavement.py | 4 | ||||
| -rwxr-xr-x | tools/travis-test.sh | 1 |
8 files changed, 13 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml index e0887a82a..1832e317c 100644 --- a/.travis.yml +++ b/.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 diff --git a/MANIFEST.in b/MANIFEST.in index 3695dfe57..4e5206b94 100644 --- a/MANIFEST.in +++ b/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 diff --git a/doc/HOWTO_BUILD_DOCS.rst.txt b/doc/HOWTO_BUILD_DOCS.rst.txt index 8107aaa81..dc0145855 100644 --- a/doc/HOWTO_BUILD_DOCS.rst.txt +++ b/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:: diff --git a/doc/Makefile b/doc/Makefile index 063ab0db8..52840be92 100644 --- a/doc/Makefile +++ b/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 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`. diff --git a/pavement.py b/pavement.py index ef6c6af52..45a6943fe 100644 --- a/pavement.py +++ b/pavement.py @@ -18,7 +18,7 @@ as follows:: 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(): diff --git a/tools/travis-test.sh b/tools/travis-test.sh index d105c15c7..3de1ca78d 100755 --- a/tools/travis-test.sh +++ b/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 |