Changeset 16136

Timestamp:

09/16/13 09:28:32 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk and trunk-jpl

Location:

issm/trunk-jpl

Files:

• . (modified) (1 prop)
• externalpackages/scipy/install-macosx-lion.sh (modified) (1 diff)
• externalpackages/scipy/install-macosx-mlion.sh (modified) (1 diff)
• externalpackages/scipy/install-macosx-snowleopard.sh (modified) (1 diff)

issm/trunk-jpl/externalpackages/scipy/install-macosx-lion.sh

@@ -19 +19 @@
 python setup.py build
 python setup.py install
+cd ..
+python -c "import scipy; print 'Installed SciPy', scipy.__version__"
+#python -c "import scipy; scipy.test()"

issm/trunk-jpl/externalpackages/scipy/install-macosx-mlion.sh

@@ -19 +19 @@
 python setup.py build
 python setup.py install
+cd ..
+python -c "import scipy; print 'Installed SciPy', scipy.__version__"
+#python -c "import scipy; scipy.test()"

issm/trunk-jpl/externalpackages/scipy/install-macosx-snowleopard.sh

@@ -15 +15 @@
 cd ..
 python -c "import scipy; print 'Installed SciPy', scipy.__version__"
-python -c "import scipy; scipy.test()"
+#python -c "import scipy; scipy.test()"