BF: fix and test sdist command

matthew-brett · matthew-brett · commit 0e7f32323863 · 2015-10-17T12:41:03.000-07:00
I broke setup.py sdist in the Python 3 refactor, because we were
previously using a version of numpy.distutils build_py, and the refactor
reverted (accidentally) to using the default disutils setup.py.

We also forgot to add the new position of the fff files to the
MANIFEST.in, so the sdist archives was broken.
diff --git a/.travis.yml b/.travis.yml
@@ -17,6 +17,7 @@ cache:
 env:
     global:
         - DEPENDS="numpy scipy sympy matplotlib nibabel"
+        - INSTALL_TYPE="setup"
 python:
     - 2.6
     - 3.2
@@ -37,6 +38,13 @@ matrix:
     - python: 3.4
       env:
         - NIPY_EXTERNAL_LAPACK=1
+    - python: 3.4
+      env:
+        - INSTALL_TYPE=sdist
+    - python: 3.4
+      env:
+        - INSTALL_TYPE=wheel
+
 before_install:
     - source tools/travis_tools.sh
     - virtualenv --python=python venv
@@ -52,7 +60,17 @@ before_install:
 # command to install dependencies
 # e.g. pip install -r requirements.txt # --use-mirrors
 install:
-    - python setup.py install
+    - |
+      if [ "$INSTALL_TYPE" == "setup" ]; then
+          python setup.py install
+      elif [ "$INSTALL_TYPE" == "sdist" ]; then
+        python setup.py sdist
+        pip install dist/*.tar.gz
+      elif [ "$INSTALL_TYPE" == "wheel" ]; then
+        pip install wheel
+        python setup.py bdist_wheel
+        pip install dist/*.whl
+      fi
 # command to run tests, e.g. python setup.py test
 script:
     # Change into an innocuous directory and find tests from installation
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -3,7 +3,7 @@ include Changelog TODO
 include *.py
 include site.*
 recursive-include nipy *.c *.h *.pyx *.pxd
-recursive-include libcstat *.c *.h *.pyx *.pxd
+recursive-include lib *.c *.h *.pyx *.pxd remake
 recursive-include scripts *
 recursive-include tools *
 # put this stuff back into setup.py (package_data) once I'm enlightened
diff --git a/setup.py b/setup.py
@@ -26,7 +26,8 @@
 build_src.generate_a_pyrex_source = generate_a_pyrex_source
 
 # Add custom commit-recording build command
-cmdclass['build_py'] = get_comrec_build('nipy')
+from numpy.distutils.command.build_py import build_py as _build_py
+cmdclass['build_py'] = get_comrec_build('nipy', _build_py)
 
 def configuration(parent_package='',top_path=None):
     from numpy.distutils.misc_util import Configuration
