[Yt-svn] yt: Import time in mods, import numpy as numpy in mods, remove t...
hg at spacepope.org
hg at spacepope.org
Tue Nov 30 12:45:19 PST 2010
hg Repository: yt
details: yt/rev/20f28b6d9117
changeset: 3560:20f28b6d9117
user: Matthew Turk <matthewturk at gmail.com>
date:
Sat Nov 27 07:52:28 2010 -0700
description:
Import time in mods, import numpy as numpy in mods, remove the osx install
scripts, always return False from ART detection.
diffstat:
doc/install_script_osx.sh | 259 ---------------------------
doc/install_script_osx106.sh | 335 ------------------------------------
yt/frontends/art/data_structures.py | 5 +-
yt/mods.py | 5 +-
4 files changed, 4 insertions(+), 600 deletions(-)
diffs (truncated from 632 to 300 lines):
diff -r 19e3e5f1c0b9 -r 20f28b6d9117 doc/install_script_osx.sh
--- a/doc/install_script_osx.sh Wed Nov 24 06:00:08 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,259 +0,0 @@
-#
-# Hi there! Welcome to the yt installation script.
-#
-# This script is designed to create a fully isolated Python installation
-# with the dependencies you need to run yt.
-#
-# There are a few options, but you only need to set *one* of them. And
-# that's the next one, DEST_DIR. But, if you want to use an existing HDF5
-# installation you can set HDF5_DIR, or if you want to use some other
-# subversion checkout of YT, you can set YT_DIR, too. (It'll already
-# check the current directory and one up.
-#
-# NOTE: If you have trouble with wxPython, set INST_WXPYTHON=0 .
-#
-# And, feel free to drop me a line: matthewturk at gmail.com
-#
-
-DEST_SUFFIX="yt-`uname -p`"
-DEST_DIR="`pwd`/${DEST_SUFFIX/ /}" # Installation location
-PY_DIR="/Library/Frameworks/Python.framework/Versions/Current/"
-
-# Here's where you put the HDF5 path if you like; otherwise it'll download it
-# and install it on its own
-#HDF5_DIR=
-
-INST_HG=1 # Install Mercurial or not?
-# If you've got YT some other place, set this to point to it.
-YT_DIR=""
-
-#------------------------------------------------------------------------------#
-# #
-# Okay, the script starts here. Feel free to play with it, but hopefully #
-# it'll work as is. #
-# #
-#------------------------------------------------------------------------------#
-
-shopt -s extglob
-
-function do_exit
-{
- echo "Failure. Check ${LOG_FILE}."
- exit 1
-}
-
-function do_setup_py
-{
- [ -e $1/done ] && return
- echo
- echo "Installing $1 (may need sudo)"
- echo
- [ ! -e $1 ] && tar xfz $1.tar.gz
- cd $1
- if [ ! -z `echo $1 | grep h5py` ]
- then
- echo "${PY_DIR}/bin/python2.5 setup.py configure --hdf5=${HDF5_DIR}"
- ( ${PY_DIR}/bin/python2.5 setup.py configure --hdf5=${HDF5_DIR} 2>&1 ) 1>> ${LOG_FILE} || do_exit
- fi
- shift
- ( sudo ${PY_DIR}/bin/python2.5 setup.py install $* 2>&1 ) 1>> ${LOG_FILE} || do_exit
- touch done
- cd ..
-}
-
-function get_enzotools
-{
- echo "Downloading $1 from yt.enzotools.org"
- [ -e $1 ] && return
- wget -nv "http://yt.enzotools.org/dependencies/osx/$1" || do_exit
- wget -nv "http://yt.enzotools.org/dependencies/osx/$1.md5" || do_exit
- ( which md5sum &> /dev/null ) || return # return if we don't have md5sum
- ( md5sum -c $1.md5 2>&1 ) 1>> ${LOG_FILE} || do_exit
-}
-
-function self_install
-{
- echo
- echo "--------------------------------------------------------------------------------"
- echo "Installing ${1}. You will need to handle this procedure."
- echo
- echo "Press enter to start, then return when finished."
- echo
- echo "--------------------------------------------------------------------------------"
- echo
- read LOKI
- ext="${1##*.}"
- if [ "${ext}" = "dmg" ]
- then
- [ ! -d ${DEST_DIR}/src/mount_point/ ] && \
- ( mkdir ${DEST_DIR}/src/mount_point/ 2>&1 ) >> ${LOG_FILE}
- ( hdiutil unmount ${DEST_DIR}/src/mount_point 2>&1 ) >> ${LOG_FILE}
- ( hdiutil mount ${1} -mountpoint ${DEST_DIR}/src/mount_point/ 2>&1 ) \
- >> ${LOG_FILE}
- open ${DEST_DIR}/src/mount_point/?(*.mpkg|*.pkg)
- else
- open ${1}
- fi
- echo
- echo "--------------------------------------------------------------------------------"
- echo
- echo "Press enter when the installation is complete."
- echo
- echo "--------------------------------------------------------------------------------"
- echo
- read LOKI
- [ "${ext}" = "dmg" ] && \
- ( hdiutil unmount ${DEST_DIR}/src/mount_point/ 2>&1 ) >> ${LOG_FILE}
-}
-
-ORIG_PWD=`pwd`
-
-LOG_FILE="${DEST_DIR}/yt_install.log"
-
-if [ -z "${DEST_DIR}" ]
-then
- echo "Edit this script, set the DEST_DIR parameter and re-run."
- exit 1
-fi
-
-echo "Installing into ${DEST_DIR}"
-
-mkdir -p ${DEST_DIR}/src
-cd ${DEST_DIR}/src
-
-# Individual processes
-if [ -z "$HDF5_DIR" ]
-then
- echo "Downloading HDF5"
- get_enzotools hdf5-1.6.8.tar.gz
-fi
-
-get_enzotools python-2.5.4-macosx.dmg
-get_enzotools wxPython2.8-osx-unicode-2.8.9.2-universal-py2.5.dmg
-get_enzotools numpy-1.2.1-py2.5-macosx10.5.dmg
-get_enzotools matplotlib-0.98.5.2-py2.5-mpkg.zip
-get_enzotools ipython-0.10.tar.gz
-get_enzotools h5py-1.2.0.tar.gz
-
-if [ -z "$YT_DIR" ]
-then
- if [ -e $ORIG_PWD/yt/mods.py ]
- then
- YT_DIR="$ORIG_PWD"
- elif [ -e $ORIG_PWD/../yt/mods.py ]
- then
- YT_DIR=`dirname $ORIG_PWD`
- elif [ ! -e yt-trunk-svn ]
- then
- ( svn co http://svn.enzotools.org/yt/trunk/ ./yt-trunk-svn 2>&1 ) 1>> ${LOG_FILE}
- YT_DIR="$PWD/yt-trunk-svn/"
- elif [ -e yt-trunk-svn ]
- then
- YT_DIR="$PWD/yt-trunk-svn/"
- fi
- echo Setting YT_DIR=${YT_DIR}
-fi
-
-if [ -z "$HDF5_DIR" ]
-then
- if [ ! -e hdf5-1.6.8/done ]
- then
- [ ! -e hdf5-1.6.8 ] && tar xfz hdf5-1.6.8.tar.gz
- echo "Installing HDF5"
- cd hdf5-1.6.8
- ( ./configure --prefix=${DEST_DIR}/ --enable-shared 2>&1 ) 1>> ${LOG_FILE} || do_exit
- ( make install 2>&1 ) 1>> ${LOG_FILE} || do_exit
- touch done
- cd ..
- fi
- export HDF5_DIR=${DEST_DIR}
-fi
-export HDF5_API=16
-
-[ ! -e ${DEST_DIR}/src/py_done ] && self_install \
- python-2.5.4-macosx.dmg
-touch ${DEST_DIR}/src/py_done
-
-[ ! -e ${DEST_DIR}/src/wx_done ] && self_install \
- wxPython2.8-osx-unicode-2.8.9.2-universal-py2.5.dmg
-touch ${DEST_DIR}/src/wx_done
-
-echo "Installing setuptools (needs sudo)"
-echo
-( sudo ${PY_DIR}/bin/python2.5 ${YT_DIR}/distribute_setup.py 2>&1 ) 1>> ${LOG_FILE} || do_exit
-
-[ ! -e ${DEST_DIR}/src/np_done ] && self_install \
- numpy-1.2.1-py2.5-macosx10.5.dmg
-touch ${DEST_DIR}/src/np_done
-
-if [ ! -e ${DEST_DIR}/src/mp_done ]
-then
- [ ! -e matplotlib-0.98.5.2-py2.5-macosx10.5.mpkg ] && unzip matplotlib-0.98.5.2-py2.5-mpkg.zip
- self_install matplotlib-0.98.5.2-py2.5-macosx10.5.mpkg
- touch ${DEST_DIR}/src/mp_done
-fi
-
-do_setup_py ipython-0.10
-do_setup_py h5py-1.2.0
-
-echo "Doing yt update"
-MY_PWD=`pwd`
-cd $YT_DIR
-( svn up 2>&1 ) 1>> ${LOG_FILE}
-
-echo "Installing yt (may need sudo)"
-echo $HDF5_DIR > hdf5.cfg
-echo /usr/X11 > png.cfg # I think this should work everywhere
-( ${PY_DIR}/bin/python2.5 setup.py build_ext -i 2>&1 ) 1>> ${LOG_FILE} || do_exit
-( sudo ${PY_DIR}/bin/python2.5 setup.py develop 2>&1 ) 1>> ${LOG_FILE} || do_exit
-touch done
-cd $MY_PWD
-
-if [ $INST_HG -eq 1 ]
-then
- echo "Installing Mercurial."
- ( sudo ${PY_DIR}/bin/easy_install-2.5 mercurial 2>&1 ) 1>> ${LOG_FILE} || do_exit
-fi
-
-echo
-echo
-echo "========================================================================"
-echo
-echo "yt is now installed in $DEST_DIR ."
-echo "To run from this new installation, the a few variables need to be"
-echo "prepended with the following information:"
-echo
-echo "PATH => $PY_DIR/bin/"
-echo
-echo "For interactive data analysis and visualization, we recommend running"
-echo "the IPython interface, which will become more fully featured with time:"
-echo
-echo "$PY_DIR/bin/iyt"
-echo
-echo "For command line analysis run:"
-echo
-echo "$PY_DIR/bin/yt"
-echo
-echo "Note of interest: this installation will use the directory"
-echo "$YT_DIR"
-echo "as the source for all the YT code. This means you probably shouldn't"
-echo "delete it, but on the plus side, any changes you make there are"
-echo "automatically propagated."
-if [ $INST_HG -eq 1 ]
-then
- echo "Mercurial has also been installed:"
- echo
- echo "$DEST_DIR/bin/hg"
- echo
-fi
-echo
-echo "For support, see one of the following websites:"
-echo
-echo " http://yt.enzotools.org/wiki/"
-echo " http://yt.enzotools.org/doc/"
-echo
-echo "Or join the mailing list:"
-echo
-echo " http://lists.spacepope.org/listinfo.cgi/yt-users-spacepope.org"
-echo
-echo "========================================================================"
diff -r 19e3e5f1c0b9 -r 20f28b6d9117 doc/install_script_osx106.sh
--- a/doc/install_script_osx106.sh Wed Nov 24 06:00:08 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,335 +0,0 @@
-#
-# Hi there! Welcome to the yt installation script.
-#
-# This script is designed to create a fully isolated Python installation
-# with the dependencies you need to run yt.
-#
-# There are a few options, but you only need to set *one* of them. And
-# that's the next one, DEST_DIR. But, if you want to use an existing HDF5
-# installation you can set HDF5_DIR, or if you want to use some other
-# subversion checkout of YT, you can set YT_DIR, too. (It'll already
-# check the current directory and one up.
-#
-# And, feel free to drop me a line: matthewturk at gmail.com
-#
-
-DEST_SUFFIX="yt-`uname -p`"
-DEST_DIR="`pwd`/${DEST_SUFFIX/ /}" # Installation location
-PY_DIR="/Library/Frameworks/Python.framework/Versions/Current/"
-
-# Here's where you put the HDF5 path if you like; otherwise it'll download it
-# and install it on its own
-HDF5_DIR=
-
-INST_HG=1 # Install Mercurial or not?
-INST_GUI=1 # Install the necessary bits for the GUI?
-# If you've got YT some other place, set this to point to it.
-YT_DIR=
-
-#------------------------------------------------------------------------------#
-# #
-# Okay, the script starts here. Feel free to play with it, but hopefully #
-# it'll work as is. #
-# #
More information about the yt-svn
mailing list