[Yt-svn] commit/yt: 9 new changesets
Bitbucket
commits-noreply at bitbucket.org
Sat Oct 29 10:13:47 PDT 2011
9 new commits in yt:
https://bitbucket.org/yt_analysis/yt/changeset/98c60a94cf33/
changeset: 98c60a94cf33
branch: yt
user: jsoishi
date: 2011-10-28 19:40:42
summary: updated dependencies
affected #: 1 file
diff -r 0eb936dbc3431bb5fce2e42aba1796d3ad38d1ef -r 98c60a94cf33f31149b5beb07b75a5b97c513eae doc/install_script.sh
--- a/doc/install_script.sh
+++ b/doc/install_script.sh
@@ -292,7 +292,7 @@
if [ -z "$HDF5_DIR" ]
then
echo "Downloading HDF5"
- get_enzotools hdf5-1.8.6.tar.gz
+ get_enzotools hdf5-1.8.7.tar.gz
fi
[ $INST_ZLIB -eq 1 ] && get_enzotools zlib-1.2.3.tar.bz2
@@ -300,14 +300,14 @@
[ $INST_PNG -eq 1 ] && get_enzotools libpng-1.2.43.tar.gz
[ $INST_FTYPE -eq 1 ] && get_enzotools freetype-2.4.4.tar.gz
[ $INST_SQLITE3 -eq 1 ] && get_enzotools sqlite-autoconf-3070500.tar.gz
-get_enzotools Python-2.7.1.tgz
-get_enzotools numpy-1.5.1.tar.gz
-get_enzotools matplotlib-1.0.0.tar.gz
+get_enzotools Python-2.7.2.tgz
+get_enzotools numpy-1.6.1.tar.gz
+get_enzotools matplotlib-1.1.0.tar.gz
get_enzotools mercurial-1.8.1.tar.gz
get_enzotools ipython-0.10.tar.gz
-get_enzotools h5py-1.3.1.tar.gz
+get_enzotools h5py-2.0.1.tar.gz
get_enzotools Cython-0.15.tar.gz
-get_enzotools Forthon-0.8.4.tar.gz
+get_enzotools Forthon-0.8.5.tar.gz
get_enzotools ext-3.3.2.zip
get_enzotools ext-slate-110328.zip
get_enzotools PhiloGL-1.1.0.zip
@@ -392,11 +392,11 @@
if [ -z "$HDF5_DIR" ]
then
- if [ ! -e hdf5-1.8.6/done ]
+ if [ ! -e hdf5-1.8.7/done ]
then
- [ ! -e hdf5-1.8.6 ] && tar xfz hdf5-1.8.6.tar.gz
+ [ ! -e hdf5-1.8.7 ] && tar xfz hdf5-1.8.7.tar.gz
echo "Installing HDF5"
- cd hdf5-1.8.6
+ cd hdf5-1.8.7
( ./configure --prefix=${DEST_DIR}/ --enable-shared 2>&1 ) 1>> ${LOG_FILE} || do_exit
( make ${MAKE_PROCS} install 2>&1 ) 1>> ${LOG_FILE} || do_exit
touch done
@@ -422,11 +422,11 @@
fi
fi
-if [ ! -e Python-2.7.1/done ]
+if [ ! -e Python-2.7.2/done ]
then
echo "Installing Python. This may take a while, but don't worry. YT loves you."
- [ ! -e Python-2.7.1 ] && tar xfz Python-2.7.1.tgz
- cd Python-2.7.1
+ [ ! -e Python-2.7.2 ] && tar xfz Python-2.7.2.tgz
+ cd Python-2.7.2
( ./configure --prefix=${DEST_DIR}/ 2>&1 ) 1>> ${LOG_FILE} || do_exit
( make ${MAKE_PROCS} 2>&1 ) 1>> ${LOG_FILE} || do_exit
@@ -488,7 +488,7 @@
echo "Installing pip"
( ${DEST_DIR}/bin/easy_install-2.7 pip 2>&1 ) 1>> ${LOG_FILE} || do_exit
-do_setup_py numpy-1.5.1 ${NUMPY_ARGS}
+do_setup_py numpy-1.6.1 ${NUMPY_ARGS}
if [ -n "${MPL_SUPP_LDFLAGS}" ]
then
@@ -509,10 +509,10 @@
echo "Setting CFLAGS ${CFLAGS}"
fi
# Now we set up the basedir for matplotlib:
-mkdir -p ${DEST_DIR}/src/matplotlib-1.0.0
-echo "[directories]" >> ${DEST_DIR}/src/matplotlib-1.0.0/setup.cfg
-echo "basedirlist = ${DEST_DIR}" >> ${DEST_DIR}/src/matplotlib-1.0.0/setup.cfg
-do_setup_py matplotlib-1.0.0
+mkdir -p ${DEST_DIR}/src/matplotlib-1.1.0
+echo "[directories]" >> ${DEST_DIR}/src/matplotlib-1.1.0/setup.cfg
+echo "basedirlist = ${DEST_DIR}" >> ${DEST_DIR}/src/matplotlib-1.1.0/setup.cfg
+do_setup_py matplotlib-1.1.0
if [ -n "${OLD_LDFLAGS}" ]
then
export LDFLAG=${OLD_LDFLAGS}
@@ -521,9 +521,9 @@
[ -n "${OLD_CXXFLAGS}" ] && export CXXFLAGS=${OLD_CXXFLAGS}
[ -n "${OLD_CFLAGS}" ] && export CFLAGS=${OLD_CFLAGS}
do_setup_py ipython-0.10
-do_setup_py h5py-1.3.1
+do_setup_py h5py-2.0.1
do_setup_py Cython-0.15
-[ $INST_FORTHON -eq 1 ] && do_setup_py Forthon-0.8.4
+[ $INST_FORTHON -eq 1 ] && do_setup_py Forthon-0.8.5
echo "Doing yt update, wiping local changes and updating to branch ${BRANCH}"
MY_PWD=`pwd`
https://bitbucket.org/yt_analysis/yt/changeset/08c0c7172002/
changeset: 08c0c7172002
branch: yt
user: jsoishi
date: 2011-10-28 20:22:04
summary: corrected Forthon file name
affected #: 1 file
diff -r 98c60a94cf33f31149b5beb07b75a5b97c513eae -r 08c0c717200239fc156ba6bd2ecab1a8b28b9038 doc/install_script.sh
--- a/doc/install_script.sh
+++ b/doc/install_script.sh
@@ -307,7 +307,7 @@
get_enzotools ipython-0.10.tar.gz
get_enzotools h5py-2.0.1.tar.gz
get_enzotools Cython-0.15.tar.gz
-get_enzotools Forthon-0.8.5.tar.gz
+get_enzotools Forthon-0.8.5.tgz
get_enzotools ext-3.3.2.zip
get_enzotools ext-slate-110328.zip
get_enzotools PhiloGL-1.1.0.zip
https://bitbucket.org/yt_analysis/yt/changeset/51706808bddd/
changeset: 51706808bddd
branch: yt
user: jsoishi
date: 2011-10-28 22:56:04
summary: corrected do_setup_py for new h5py
affected #: 1 file
diff -r 08c0c717200239fc156ba6bd2ecab1a8b28b9038 -r 51706808bddd696489e430997ecfc2c42a46a528 doc/install_script.sh
--- a/doc/install_script.sh
+++ b/doc/install_script.sh
@@ -257,11 +257,12 @@
cd $1
if [ ! -z `echo $1 | grep h5py` ]
then
- echo "${DEST_DIR}/bin/python2.7 setup.py configure --hdf5=${HDF5_DIR}"
- ( ${DEST_DIR}/bin/python2.7 setup.py configure --hdf5=${HDF5_DIR} 2>&1 ) 1>> ${LOG_FILE} || do_exit
+ shift
+ ( ${DEST_DIR}/bin/python2.7 setup.py build --hdf5=${HDF5_DIR} $* 2>&1 ) 1>> ${LOG_FILE} || do_exit
+ else
+ shift
+ ( ${DEST_DIR}/bin/python2.7 setup.py build $* 2>&1 ) 1>> ${LOG_FILE} || do_exit
fi
- shift
- ( ${DEST_DIR}/bin/python2.7 setup.py build $* 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 ..
https://bitbucket.org/yt_analysis/yt/changeset/914a0ad2ab9f/
changeset: 914a0ad2ab9f
branch: yt
user: jsoishi
date: 2011-10-29 00:07:12
summary: removed outdated H5py error to be compatible with h5py-2.0. however, this could catch exceptions it shouldn't!
affected #: 1 file
diff -r 51706808bddd696489e430997ecfc2c42a46a528 -r 914a0ad2ab9ff101aff811df967db27525332a0b yt/frontends/enzo/data_structures.py
--- a/yt/frontends/enzo/data_structures.py
+++ b/yt/frontends/enzo/data_structures.py
@@ -291,7 +291,7 @@
if not ytcfg.getboolean("yt","serialize"): return False
try:
f = h5py.File(self.hierarchy_filename[:-9] + "harrays")
- except h5py.h5.H5Error:
+ except:
return False
self.grid_dimensions[:] = f["/ActiveDimensions"][:]
self.grid_left_edge[:] = f["/LeftEdges"][:]
https://bitbucket.org/yt_analysis/yt/changeset/bb1e568523b4/
changeset: bb1e568523b4
branch: yt
user: jsoishi
date: 2011-10-29 17:07:46
summary: fixed Forthon filename (again)
affected #: 1 file
diff -r 51706808bddd696489e430997ecfc2c42a46a528 -r bb1e568523b443d460ec951a7324264255a0f1ab doc/install_script.sh
--- a/doc/install_script.sh
+++ b/doc/install_script.sh
@@ -308,7 +308,7 @@
get_enzotools ipython-0.10.tar.gz
get_enzotools h5py-2.0.1.tar.gz
get_enzotools Cython-0.15.tar.gz
-get_enzotools Forthon-0.8.5.tgz
+get_enzotools Forthon-0.8.5.tar.gz
get_enzotools ext-3.3.2.zip
get_enzotools ext-slate-110328.zip
get_enzotools PhiloGL-1.1.0.zip
https://bitbucket.org/yt_analysis/yt/changeset/6533260c1df3/
changeset: 6533260c1df3
branch: yt
user: jsoishi
date: 2011-10-29 17:08:32
summary: updated a few more dependences as called for by Matt
affected #: 1 file
diff -r bb1e568523b443d460ec951a7324264255a0f1ab -r 6533260c1df3f34c035ef5423d11f2c51e8c17a6 doc/install_script.sh
--- a/doc/install_script.sh
+++ b/doc/install_script.sh
@@ -307,11 +307,11 @@
get_enzotools mercurial-1.8.1.tar.gz
get_enzotools ipython-0.10.tar.gz
get_enzotools h5py-2.0.1.tar.gz
-get_enzotools Cython-0.15.tar.gz
+get_enzotools Cython-0.15.1.tar.gz
get_enzotools Forthon-0.8.5.tar.gz
get_enzotools ext-3.3.2.zip
get_enzotools ext-slate-110328.zip
-get_enzotools PhiloGL-1.1.0.zip
+get_enzotools PhiloGL-1.4.2.zip
if [ $INST_BZLIB -eq 1 ]
then
https://bitbucket.org/yt_analysis/yt/changeset/1914d988a0d2/
changeset: 1914d988a0d2
branch: yt
user: jsoishi
date: 2011-10-29 17:08:57
summary: merged.
affected #: 1 file
diff -r 6533260c1df3f34c035ef5423d11f2c51e8c17a6 -r 1914d988a0d25a9752e5a71b1ed2c58e17e57fbc yt/frontends/enzo/data_structures.py
--- a/yt/frontends/enzo/data_structures.py
+++ b/yt/frontends/enzo/data_structures.py
@@ -291,7 +291,7 @@
if not ytcfg.getboolean("yt","serialize"): return False
try:
f = h5py.File(self.hierarchy_filename[:-9] + "harrays")
- except h5py.h5.H5Error:
+ except:
return False
self.grid_dimensions[:] = f["/ActiveDimensions"][:]
self.grid_left_edge[:] = f["/LeftEdges"][:]
https://bitbucket.org/yt_analysis/yt/changeset/423347e61ef1/
changeset: 423347e61ef1
branch: yt
user: jsoishi
date: 2011-10-29 17:35:29
summary: another typo
affected #: 1 file
diff -r 1914d988a0d25a9752e5a71b1ed2c58e17e57fbc -r 423347e61ef17c69753d6927124de22bab6058b5 doc/install_script.sh
--- a/doc/install_script.sh
+++ b/doc/install_script.sh
@@ -523,7 +523,7 @@
[ -n "${OLD_CFLAGS}" ] && export CFLAGS=${OLD_CFLAGS}
do_setup_py ipython-0.10
do_setup_py h5py-2.0.1
-do_setup_py Cython-0.15
+do_setup_py Cython-0.15.1
[ $INST_FORTHON -eq 1 ] && do_setup_py Forthon-0.8.5
echo "Doing yt update, wiping local changes and updating to branch ${BRANCH}"
https://bitbucket.org/yt_analysis/yt/changeset/be4b986161b2/
changeset: be4b986161b2
branch: yt
user: jsoishi
date: 2011-10-29 17:41:08
summary: more typos.
affected #: 1 file
diff -r 423347e61ef17c69753d6927124de22bab6058b5 -r be4b986161b2e776efc2ad5f0e14a71e3729084d doc/install_script.sh
--- a/doc/install_script.sh
+++ b/doc/install_script.sh
@@ -567,12 +567,12 @@
fi
# Now we open up PhiloGL
-if [ ! -e PhiloGL-1.1.0/done ]
+if [ ! -e PhiloGL-1.4.2/done ]
then
- ( unzip -o PhiloGL-1.1.0.zip 2>&1 ) 1>> ${LOG_FILE} || do_exit
- ( echo "Symlinking PhiloGL-1.1.0 as PhiloGL" 2>&1 ) 1>> ${LOG_FILE}
- ln -sf PhiloGL-1.1.0 PhiloGL
- touch PhiloGL-1.1.0/done
+ ( unzip -o PhiloGL-1.4.2.zip 2>&1 ) 1>> ${LOG_FILE} || do_exit
+ ( echo "Symlinking PhiloGL-1.4.2 as PhiloGL" 2>&1 ) 1>> ${LOG_FILE}
+ ln -sf PhiloGL-1.4.2 PhiloGL
+ touch PhiloGL-1.4.2/done
fi
if [ -e $HOME/.matplotlib/fontList.cache ] && \
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