[yt-svn] commit/yt: 3 new changesets
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Sat Aug 30 13:12:55 PDT 2014
3 new commits in yt:
https://bitbucket.org/yt_analysis/yt/commits/db59f1fe376e/
Changeset: db59f1fe376e
Branch: yt
User: xarthisius
Date: 2014-08-29 22:13:36
Summary: Remove old numpy when installing numpy-1.8.x. Fixes issue #889
Affected #: 1 file
diff -r db453a34418decb342392b49f10559b5fb5f43ca -r db59f1fe376e202a862c3d8f7fad1ac5e1658567 doc/install_script.sh
--- a/doc/install_script.sh
+++ b/doc/install_script.sh
@@ -500,13 +500,29 @@
fi
[ ! -e $LIB/extracted ] && tar xfz $LIB.tar.gz
touch $LIB/extracted
+ BUILD_ARGS=""
+ echo "LIB = $LIB"
+ case $LIB in
+ *h5py*)
+ BUILD_ARGS="--hdf5=${HDF5_DIR}"
+ ;;
+ *numpy*)
+ if [ -e ${DEST_DIR}/lib/python2.7/site-packages/numpy/__init__.py ]
+ then
+ VER=$(${DEST_DIR}/bin/python -c 'from distutils.version import StrictVersion as SV; \
+ import numpy; print SV(numpy.__version__) < SV("1.8.0")')
+ if [ $VER == "True" ]
+ then
+ echo "Removing previous NumPy instance (see issue #889)"
+ rm -rf ${DEST_DIR}/lib/python2.7/site-packages/{numpy*,*.pth}
+ fi
+ fi
+ ;;
+ *)
+ ;;
+ esac
cd $LIB
- if [ ! -z `echo $LIB | grep h5py` ]
- then
- ( ${DEST_DIR}/bin/python2.7 setup.py build --hdf5=${HDF5_DIR} $* 2>&1 ) 1>> ${LOG_FILE} || do_exit
- else
- ( ${DEST_DIR}/bin/python2.7 setup.py build $* 2>&1 ) 1>> ${LOG_FILE} || do_exit
- fi
+ ( ${DEST_DIR}/bin/python2.7 setup.py build ${BUILD_ARGS} $* 2>&1 ) 1>> ${LOG_FILE} || do_exit
( ${DEST_DIR}/bin/python2.7 setup.py install 2>&1 ) 1>> ${LOG_FILE} || do_exit
touch done
cd ..
@@ -726,7 +742,7 @@
cd $FREETYPE_VER
( ./configure CFLAGS=-I${DEST_DIR}/include --prefix=${DEST_DIR}/ 2>&1 ) 1>> ${LOG_FILE} || do_exit
( make 2>&1 ) 1>> ${LOG_FILE} || do_exit
- ( make install 2>&1 ) 1>> ${LOG_FILE} || do_exit
+ ( make install 2>&1 ) 1>> ${LOG_FILE} || do_exit
( make clean 2>&1) 1>> ${LOG_FILE} || do_exit
touch done
cd ..
https://bitbucket.org/yt_analysis/yt/commits/43e4421bc665/
Changeset: 43e4421bc665
Branch: yt
User: xarthisius
Date: 2014-08-29 22:26:24
Summary: Remove debug statement
Affected #: 1 file
diff -r db59f1fe376e202a862c3d8f7fad1ac5e1658567 -r 43e4421bc665b13fbb56d1e4ae7969e1a4c7db26 doc/install_script.sh
--- a/doc/install_script.sh
+++ b/doc/install_script.sh
@@ -501,7 +501,6 @@
[ ! -e $LIB/extracted ] && tar xfz $LIB.tar.gz
touch $LIB/extracted
BUILD_ARGS=""
- echo "LIB = $LIB"
case $LIB in
*h5py*)
BUILD_ARGS="--hdf5=${HDF5_DIR}"
https://bitbucket.org/yt_analysis/yt/commits/28f21e2e3926/
Changeset: 28f21e2e3926
Branch: yt
User: chummels
Date: 2014-08-30 22:12:49
Summary: Merged in xarthisius/yt (pull request #1175)
Remove old numpy when installing numpy-1.8.x. Fixes issue #889
Affected #: 1 file
diff -r e292fac32649b8875af6cadbc62a3da8c7f44ca2 -r 28f21e2e39265d69c81a9c6c3647729b6f2133eb doc/install_script.sh
--- a/doc/install_script.sh
+++ b/doc/install_script.sh
@@ -500,13 +500,28 @@
fi
[ ! -e $LIB/extracted ] && tar xfz $LIB.tar.gz
touch $LIB/extracted
+ BUILD_ARGS=""
+ case $LIB in
+ *h5py*)
+ BUILD_ARGS="--hdf5=${HDF5_DIR}"
+ ;;
+ *numpy*)
+ if [ -e ${DEST_DIR}/lib/python2.7/site-packages/numpy/__init__.py ]
+ then
+ VER=$(${DEST_DIR}/bin/python -c 'from distutils.version import StrictVersion as SV; \
+ import numpy; print SV(numpy.__version__) < SV("1.8.0")')
+ if [ $VER == "True" ]
+ then
+ echo "Removing previous NumPy instance (see issue #889)"
+ rm -rf ${DEST_DIR}/lib/python2.7/site-packages/{numpy*,*.pth}
+ fi
+ fi
+ ;;
+ *)
+ ;;
+ esac
cd $LIB
- if [ ! -z `echo $LIB | grep h5py` ]
- then
- ( ${DEST_DIR}/bin/python2.7 setup.py build --hdf5=${HDF5_DIR} $* 2>&1 ) 1>> ${LOG_FILE} || do_exit
- else
- ( ${DEST_DIR}/bin/python2.7 setup.py build $* 2>&1 ) 1>> ${LOG_FILE} || do_exit
- fi
+ ( ${DEST_DIR}/bin/python2.7 setup.py build ${BUILD_ARGS} $* 2>&1 ) 1>> ${LOG_FILE} || do_exit
( ${DEST_DIR}/bin/python2.7 setup.py install 2>&1 ) 1>> ${LOG_FILE} || do_exit
touch done
cd ..
@@ -726,7 +741,7 @@
cd $FREETYPE_VER
( ./configure CFLAGS=-I${DEST_DIR}/include --prefix=${DEST_DIR}/ 2>&1 ) 1>> ${LOG_FILE} || do_exit
( make 2>&1 ) 1>> ${LOG_FILE} || do_exit
- ( make install 2>&1 ) 1>> ${LOG_FILE} || do_exit
+ ( make install 2>&1 ) 1>> ${LOG_FILE} || do_exit
( make clean 2>&1) 1>> ${LOG_FILE} || do_exit
touch done
cd ..
Repository URL: https://bitbucket.org/yt_analysis/yt/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
More information about the yt-svn
mailing list