[Numpy-svn] r8335 - branches/1.4.x

numpy-svn@scip... numpy-svn@scip...
Sun Apr 18 03:46:39 CDT 2010


Author: rgommers
Date: 2010-04-18 03:46:39 -0500 (Sun, 18 Apr 2010)
New Revision: 8335

Modified:
   branches/1.4.x/pavement.py
Log:
BUG: doc build needs access to site-packages to find MPL.

Modified: branches/1.4.x/pavement.py
===================================================================
--- branches/1.4.x/pavement.py	2010-04-14 17:24:50 UTC (rev 8334)
+++ branches/1.4.x/pavement.py	2010-04-18 08:46:39 UTC (rev 8335)
@@ -88,12 +88,13 @@
 SUPERPACK_BINDIR = os.path.join(SUPERPACK_BUILD, 'binaries')
 
 options(bootstrap=Bunch(bootstrap_dir="bootstrap"),
-        virtualenv=Bunch(packages_to_install=["sphinx", "numpydoc"], no_site_packages=True),
+        virtualenv=Bunch(packages_to_install=["sphinx", "numpydoc"],
+        no_site_packages=False),
         sphinx=Bunch(builddir="build", sourcedir="source", docroot='doc'),
         superpack=Bunch(builddir="build-superpack"),
         installers=Bunch(releasedir="release",
                          installersdir=os.path.join("release", "installers")),
-        doc=Bunch(doc_root="doc", 
+        doc=Bunch(doc_root="doc",
             sdir=os.path.join("doc", "source"),
             bdir=os.path.join("doc", "build"),
             bdir_latex=os.path.join("doc", "build", "latex"),
@@ -208,7 +209,7 @@
     copy_bdist("sse2")
     bdist_wininst_arch(pyver, 'sse3')
     copy_bdist("sse3")
-    
+
     idirs = options.installers.installersdir
     pyver = options.python_version
     prepare_nsis_script(pyver, FULLVERSION)
@@ -275,8 +276,8 @@
 
     options.virtualenv.script_name = os.path.join(options.bootstrap_dir,
                                                   bscript)
-    options.virtualenv.no_site_packages = True
-    options.bootstrap.no_site_packages = True
+    options.virtualenv.no_site_packages = False
+    options.bootstrap.no_site_packages = False
     call_task('paver.virtual.bootstrap')
     sh('cd %s; %s %s' % (bdir, sys.executable, bscript))
 



More information about the Numpy-svn mailing list