MAINT: refactor doc build to use installed nipy

matthew-brett · matthew-brett · commit 9c4dc2175096 · 2017-03-13T16:03:43.000-07:00
Makefile was using PYTHONPATH to pick up nipy source; we can use
in-place build for that use - just pick up the installed nipy.

Also - check in-place build.
diff --git a/.travis.yml b/.travis.yml
@@ -66,6 +66,9 @@ matrix:
     - python: 3.5
       env:
         - INSTALL_TYPE=setup
+    - python: 3.5
+      env:
+        - INSTALL_TYPE="pip_e"
     - python: 3.5
       env:
         - DOC_BUILD=1
@@ -97,9 +100,11 @@ before_install:
 install:
     - |
       if [ "$INSTALL_TYPE" == "pip" ]; then
-          pip install .
+        pip install .
+      elif [ "$INSTALL_TYPE" == "pip_e" ]; then
+        pip install -e .
       elif [ "$INSTALL_TYPE" == "setup" ]; then
-          python setup.py install
+        python setup.py install
       elif [ "$INSTALL_TYPE" == "sdist" ]; then
         python setup_egg.py egg_info  # check egg_info while we're here
         python setup_egg.py sdist
diff --git a/Makefile b/Makefile
@@ -111,10 +111,10 @@ $(WWW_DIR):
 	if [ ! -d $(WWW_DIR) ]; then mkdir -p $(WWW_DIR); fi
 
 htmldoc:
-	cd $(DOCSRC_DIR) && PYTHONPATH=$(CURDIR):$(PYTHONPATH) $(MAKE) html
+	cd $(DOCSRC_DIR) && $(MAKE) html
 
 pdfdoc:
-	cd $(DOCSRC_DIR) && PYTHONPATH=$(CURDIR):$(PYTHONPATH) $(MAKE) latex
+	cd $(DOCSRC_DIR) && $(MAKE) latex
 	cd $(LATEX_DIR) && $(MAKE) all-pdf
 
 html: html-stamp
