[yt-svn] commit/yt: 2 new changesets
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Wed Aug 24 11:07:49 PDT 2016
2 new commits in yt:
https://bitbucket.org/yt_analysis/yt/commits/abc2ddbe9ae0/
Changeset: abc2ddbe9ae0
Branch: yt
User: ngoldbaum
Date: 2016-08-08 16:46:40+00:00
Summary: use absolute paths to executables in install script
Affected #: 1 file
diff -r 1a9c9ab1575b1d2fc4ce517acc44074cf333a4c7 -r abc2ddbe9ae0d320fc829a878bcf6f9f384a0f82 doc/install_script.sh
--- a/doc/install_script.sh
+++ b/doc/install_script.sh
@@ -1429,25 +1429,24 @@
YT_DEPS+=('netcdf4')
fi
- # Here is our dependency list for yt
- log_cmd conda update --yes conda
+ log_cmd ${DEST_DIR}/bin/conda update --yes conda
log_cmd echo "DEPENDENCIES" ${YT_DEPS[@]}
for YT_DEP in "${YT_DEPS[@]}"; do
echo "Installing $YT_DEP"
- log_cmd conda install --yes ${YT_DEP}
+ log_cmd ${DEST_DIR}/bin/conda install --yes ${YT_DEP}
done
if [ $INST_PY3 -eq 1 ]
then
echo "Installing mercurial"
- log_cmd conda create -y -n py27 python=2.7 mercurial
+ log_cmd ${DEST_DIR}/bin/conda create -y -n py27 python=2.7 mercurial
log_cmd ln -s ${DEST_DIR}/envs/py27/bin/hg ${DEST_DIR}/bin
fi
- log_cmd pip install python-hglib
+ log_cmd ${DEST_DIR}/bin/pip install python-hglib
- log_cmd hg clone https://bitbucket.org/yt_analysis/yt_conda ${DEST_DIR}/src/yt_conda
+ log_cmd ${DEST_DIR}/bin/hg clone https://bitbucket.org/yt_analysis/yt_conda ${DEST_DIR}/src/yt_conda
if [ $INST_EMBREE -eq 1 ]
then
@@ -1474,17 +1473,17 @@
( ${GETFILE} "$PYEMBREE_URL" 2>&1 ) 1>> ${LOG_FILE} || do_exit
log_cmd unzip ${DEST_DIR}/src/master.zip
pushd ${DEST_DIR}/src/pyembree-master &> /dev/null
- log_cmd python setup.py install build_ext -I${DEST_DIR}/include -L${DEST_DIR}/lib
+ log_cmd ${DEST_DIR}/bin/${PYTHON_EXEC} setup.py install build_ext -I${DEST_DIR}/include -L${DEST_DIR}/lib
popd &> /dev/null
fi
if [ $INST_ROCKSTAR -eq 1 ]
then
echo "Building Rockstar"
- ( hg clone http://bitbucket.org/MatthewTurk/rockstar ${DEST_DIR}/src/rockstar/ 2>&1 ) 1>> ${LOG_FILE}
- ROCKSTAR_PACKAGE=$(conda build ${DEST_DIR}/src/yt_conda/rockstar --output)
- log_cmd conda build ${DEST_DIR}/src/yt_conda/rockstar
- log_cmd conda install $ROCKSTAR_PACKAGE
+ ( ${DEST_DIR}/bin/hg clone http://bitbucket.org/MatthewTurk/rockstar ${DEST_DIR}/src/rockstar/ 2>&1 ) 1>> ${LOG_FILE}
+ ROCKSTAR_PACKAGE=$(${DEST_DIR}/bin/conda build ${DEST_DIR}/src/yt_conda/rockstar --output)
+ log_cmd ${DEST_DIR}/bin/conda build ${DEST_DIR}/src/yt_conda/rockstar
+ log_cmd ${DEST_DIR}/bin/conda install $ROCKSTAR_PACKAGE
ROCKSTAR_DIR=${DEST_DIR}/src/rockstar
fi
@@ -1493,20 +1492,20 @@
then
if [ $INST_PY3 -eq 1 ]
then
- log_cmd pip install pyx
+ log_cmd ${DEST_DIR}/bin/pip install pyx
else
- log_cmd pip install pyx==0.12.1
+ log_cmd ${DEST_DIR}/bin/pip install pyx==0.12.1
fi
fi
if [ $INST_YT_SOURCE -eq 0 ]
then
echo "Installing yt"
- log_cmd conda install -c conda-forge --yes yt
+ log_cmd ${DEST_DIR}/bin/conda install -c conda-forge --yes yt
else
echo "Building yt from source"
YT_DIR="${DEST_DIR}/src/yt-hg"
- log_cmd hg clone -r ${BRANCH} https://bitbucket.org/yt_analysis/yt ${YT_DIR}
+ log_cmd ${DEST_DIR}/bin/hg clone -r ${BRANCH} https://bitbucket.org/yt_analysis/yt ${YT_DIR}
if [ $INST_EMBREE -eq 1 ]
then
echo $DEST_DIR > ${YT_DIR}/embree.cfg
@@ -1517,7 +1516,7 @@
ROCKSTAR_LIBRARY_PATH=${DEST_DIR}/lib
fi
pushd ${YT_DIR} &> /dev/null
- ( LIBRARY_PATH=$ROCKSTAR_LIBRARY_PATH python setup.py develop 2>&1) 1>> ${LOG_FILE} || do_exit
+ ( LIBRARY_PATH=$ROCKSTAR_LIBRARY_PATH ${DEST_DIR}/bin/${PYTHON_EXEC} setup.py develop 2>&1) 1>> ${LOG_FILE} || do_exit
popd &> /dev/null
fi
https://bitbucket.org/yt_analysis/yt/commits/3215003cc440/
Changeset: 3215003cc440
Branch: yt
User: ngoldbaum
Date: 2016-08-24 18:07:14+00:00
Summary: Merged in ngoldbaum/yt (pull request #2327)
Use absolute paths to executables in install script
Affected #: 1 file
diff -r 8e0cb2ce536dafacc0f073335d86295ac7650b38 -r 3215003cc44051d99c126f9bf58e9977e2708332 doc/install_script.sh
--- a/doc/install_script.sh
+++ b/doc/install_script.sh
@@ -1429,25 +1429,24 @@
YT_DEPS+=('netcdf4')
fi
- # Here is our dependency list for yt
- log_cmd conda update --yes conda
+ log_cmd ${DEST_DIR}/bin/conda update --yes conda
log_cmd echo "DEPENDENCIES" ${YT_DEPS[@]}
for YT_DEP in "${YT_DEPS[@]}"; do
echo "Installing $YT_DEP"
- log_cmd conda install --yes ${YT_DEP}
+ log_cmd ${DEST_DIR}/bin/conda install --yes ${YT_DEP}
done
if [ $INST_PY3 -eq 1 ]
then
echo "Installing mercurial"
- log_cmd conda create -y -n py27 python=2.7 mercurial
+ log_cmd ${DEST_DIR}/bin/conda create -y -n py27 python=2.7 mercurial
log_cmd ln -s ${DEST_DIR}/envs/py27/bin/hg ${DEST_DIR}/bin
fi
- log_cmd pip install python-hglib
+ log_cmd ${DEST_DIR}/bin/pip install python-hglib
- log_cmd hg clone https://bitbucket.org/yt_analysis/yt_conda ${DEST_DIR}/src/yt_conda
+ log_cmd ${DEST_DIR}/bin/hg clone https://bitbucket.org/yt_analysis/yt_conda ${DEST_DIR}/src/yt_conda
if [ $INST_EMBREE -eq 1 ]
then
@@ -1474,17 +1473,17 @@
( ${GETFILE} "$PYEMBREE_URL" 2>&1 ) 1>> ${LOG_FILE} || do_exit
log_cmd unzip ${DEST_DIR}/src/master.zip
pushd ${DEST_DIR}/src/pyembree-master &> /dev/null
- log_cmd python setup.py install build_ext -I${DEST_DIR}/include -L${DEST_DIR}/lib
+ log_cmd ${DEST_DIR}/bin/${PYTHON_EXEC} setup.py install build_ext -I${DEST_DIR}/include -L${DEST_DIR}/lib
popd &> /dev/null
fi
if [ $INST_ROCKSTAR -eq 1 ]
then
echo "Building Rockstar"
- ( hg clone http://bitbucket.org/MatthewTurk/rockstar ${DEST_DIR}/src/rockstar/ 2>&1 ) 1>> ${LOG_FILE}
- ROCKSTAR_PACKAGE=$(conda build ${DEST_DIR}/src/yt_conda/rockstar --output)
- log_cmd conda build ${DEST_DIR}/src/yt_conda/rockstar
- log_cmd conda install $ROCKSTAR_PACKAGE
+ ( ${DEST_DIR}/bin/hg clone http://bitbucket.org/MatthewTurk/rockstar ${DEST_DIR}/src/rockstar/ 2>&1 ) 1>> ${LOG_FILE}
+ ROCKSTAR_PACKAGE=$(${DEST_DIR}/bin/conda build ${DEST_DIR}/src/yt_conda/rockstar --output)
+ log_cmd ${DEST_DIR}/bin/conda build ${DEST_DIR}/src/yt_conda/rockstar
+ log_cmd ${DEST_DIR}/bin/conda install $ROCKSTAR_PACKAGE
ROCKSTAR_DIR=${DEST_DIR}/src/rockstar
fi
@@ -1493,20 +1492,20 @@
then
if [ $INST_PY3 -eq 1 ]
then
- log_cmd pip install pyx
+ log_cmd ${DEST_DIR}/bin/pip install pyx
else
- log_cmd pip install pyx==0.12.1
+ log_cmd ${DEST_DIR}/bin/pip install pyx==0.12.1
fi
fi
if [ $INST_YT_SOURCE -eq 0 ]
then
echo "Installing yt"
- log_cmd conda install -c conda-forge --yes yt
+ log_cmd ${DEST_DIR}/bin/conda install -c conda-forge --yes yt
else
echo "Building yt from source"
YT_DIR="${DEST_DIR}/src/yt-hg"
- log_cmd hg clone -r ${BRANCH} https://bitbucket.org/yt_analysis/yt ${YT_DIR}
+ log_cmd ${DEST_DIR}/bin/hg clone -r ${BRANCH} https://bitbucket.org/yt_analysis/yt ${YT_DIR}
if [ $INST_EMBREE -eq 1 ]
then
echo $DEST_DIR > ${YT_DIR}/embree.cfg
@@ -1517,7 +1516,7 @@
ROCKSTAR_LIBRARY_PATH=${DEST_DIR}/lib
fi
pushd ${YT_DIR} &> /dev/null
- ( LIBRARY_PATH=$ROCKSTAR_LIBRARY_PATH python setup.py develop 2>&1) 1>> ${LOG_FILE} || do_exit
+ ( LIBRARY_PATH=$ROCKSTAR_LIBRARY_PATH ${DEST_DIR}/bin/${PYTHON_EXEC} setup.py develop 2>&1) 1>> ${LOG_FILE} || do_exit
popd &> /dev/null
fi
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