[yt-svn] commit/yt: 6 new changesets
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Wed Jul 13 13:41:07 PDT 2016
6 new commits in yt:
https://bitbucket.org/yt_analysis/yt/commits/b70217d4c652/
Changeset: b70217d4c652
Branch: yt
User: ngoldbaum
Date: 2016-07-10 20:49:18+00:00
Summary: Add basic install validation to the install script. Closes #1233
Affected #: 1 file
diff -r 96474e2371d16811f1cc105b5e0c7fdb6a9f5dc3 -r b70217d4c652f3a5e1252fd9861a7eb85b9d0ddd doc/install_script.sh
--- a/doc/install_script.sh
+++ b/doc/install_script.sh
@@ -744,6 +744,12 @@
( ${SHASUM} -c $1.sha512 2>&1 ) 1>> ${LOG_FILE} || do_exit
}
+function test_install
+{
+ echo "Testing that yt can be imported"
+ ( python -c "import yt" 2>&1 ) 1>> ${LOG_FILE} || do_exit
+}
+
ORIG_PWD=`pwd`
if [ -z "${DEST_DIR}" ]
@@ -1238,6 +1244,8 @@
( cp ${YT_DIR}/doc/activate.csh ${DEST_DIR}/bin/activate.csh 2>&1 ) 1>> ${LOG_FILE}
sed -i.bak -e "s,__YT_DIR__,${DEST_DIR}," ${DEST_DIR}/bin/activate.csh
+ test_install
+
function print_afterword
{
echo
@@ -1482,6 +1490,8 @@
popd &> /dev/null
fi
+ test_install
+
echo
echo
echo "========================================================================"
https://bitbucket.org/yt_analysis/yt/commits/1f5d60605dea/
Changeset: 1f5d60605dea
Branch: yt
User: ngoldbaum
Date: 2016-07-10 20:41:10+00:00
Summary: Print a warning if INST_CONDA=1 and PYTHONPATH is set
Affected #: 1 file
diff -r b70217d4c652f3a5e1252fd9861a7eb85b9d0ddd -r 1f5d60605dea720c280997bda97d9b5bb865d3ff doc/install_script.sh
--- a/doc/install_script.sh
+++ b/doc/install_script.sh
@@ -119,6 +119,19 @@
exit 1
fi
DEST_SUFFIX="yt-conda"
+ if [ $INST_YT_SOUCE -eq 0 ]
+ then
+ if [ -z "${PYTHONPATH}" ]
+ then
+ echo "The PYTHONPATH environment variable is set to \"$PYTHONPATH\"."
+ echo
+ echo "If dependencies of yt (numpy, scipy, matplotlib) are installed"
+ echo "to this path, this may cause issues. Exit the install script"
+ echo "with Ctrl-C and unset PYTHONPATH if you are unsure."
+ echo "Hit enter to continue."
+ read -p "[hit enter]"
+ fi
+ fi
else
if [ $INST_YT_SOURCE -eq 0 ]
then
https://bitbucket.org/yt_analysis/yt/commits/753cacfbbdcb/
Changeset: 753cacfbbdcb
Branch: yt
User: ngoldbaum
Date: 2016-07-10 20:41:25+00:00
Summary: Exit install script if building yt fails when INST_CONDA=1 and INST_YT_SOURCE=0
Affected #: 1 file
diff -r 1f5d60605dea720c280997bda97d9b5bb865d3ff -r 753cacfbbdcbefe1b40eac467f4d2ce9e9754c0e doc/install_script.sh
--- a/doc/install_script.sh
+++ b/doc/install_script.sh
@@ -1499,7 +1499,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}
+ ( LIBRARY_PATH=$ROCKSTAR_LIBRARY_PATH python setup.py develop 2>&1) 1>> ${LOG_FILE} || do_exit
popd &> /dev/null
fi
https://bitbucket.org/yt_analysis/yt/commits/d25aaaa036b4/
Changeset: d25aaaa036b4
Branch: yt
User: ngoldbaum
Date: 2016-07-11 21:32:28+00:00
Summary: responding to PR comments
Affected #: 1 file
diff -r 753cacfbbdcbefe1b40eac467f4d2ce9e9754c0e -r d25aaaa036b4f9c94584c23fef13ff98c5853091 doc/install_script.sh
--- a/doc/install_script.sh
+++ b/doc/install_script.sh
@@ -119,18 +119,17 @@
exit 1
fi
DEST_SUFFIX="yt-conda"
- if [ $INST_YT_SOUCE -eq 0 ]
+ if [ -n "${PYTHONPATH}" ]
then
- if [ -z "${PYTHONPATH}" ]
- then
- echo "The PYTHONPATH environment variable is set to \"$PYTHONPATH\"."
- echo
- echo "If dependencies of yt (numpy, scipy, matplotlib) are installed"
- echo "to this path, this may cause issues. Exit the install script"
- echo "with Ctrl-C and unset PYTHONPATH if you are unsure."
- echo "Hit enter to continue."
- read -p "[hit enter]"
- fi
+ echo "The PYTHONPATH environment variable is set to:"
+ echo
+ echo " $PYTHONPATH"
+ echo
+ echo "If dependencies of yt (numpy, scipy, matplotlib) are installed"
+ echo "to this path, this may cause issues. Exit the install script"
+ echo "with Ctrl-C and unset PYTHONPATH if you are unsure."
+ echo "Hit enter to continue."
+ read -p "[hit enter]"
fi
else
if [ $INST_YT_SOURCE -eq 0 ]
@@ -760,7 +759,7 @@
function test_install
{
echo "Testing that yt can be imported"
- ( python -c "import yt" 2>&1 ) 1>> ${LOG_FILE} || do_exit
+ ( ${DEST_DIR}/bin/${PYTHON_EXEC} -c "import yt" 2>&1 ) 1>> ${LOG_FILE} || do_exit
}
ORIG_PWD=`pwd`
https://bitbucket.org/yt_analysis/yt/commits/7dafcf0e2bf6/
Changeset: 7dafcf0e2bf6
Branch: yt
User: ngoldbaum
Date: 2016-07-11 21:57:07+00:00
Summary: Making the warning about PYTHONPATH appear more scary
Affected #: 1 file
diff -r d25aaaa036b4f9c94584c23fef13ff98c5853091 -r 7dafcf0e2bf60327c60d46e32070d3e75771a9cb doc/install_script.sh
--- a/doc/install_script.sh
+++ b/doc/install_script.sh
@@ -121,6 +121,9 @@
DEST_SUFFIX="yt-conda"
if [ -n "${PYTHONPATH}" ]
then
+ echo "WARNING WARNING WARNING WARNING WARNING WARNING WARNING"
+ echo "*******************************************************"
+ echo
echo "The PYTHONPATH environment variable is set to:"
echo
echo " $PYTHONPATH"
@@ -129,6 +132,9 @@
echo "to this path, this may cause issues. Exit the install script"
echo "with Ctrl-C and unset PYTHONPATH if you are unsure."
echo "Hit enter to continue."
+ echo
+ echo "WARNING WARNING WARNING WARNING WARNING WARNING WARNING"
+ echo "*******************************************************"
read -p "[hit enter]"
fi
else
https://bitbucket.org/yt_analysis/yt/commits/6a5dc7d9b000/
Changeset: 6a5dc7d9b000
Branch: yt
User: xarthisius
Date: 2016-07-13 20:40:33+00:00
Summary: Merged in ngoldbaum/yt (pull request #2270)
Install script improvements. Closes #1233
Affected #: 1 file
diff -r 5e50ddf62454f276c63fc939ab6aa96cceefc817 -r 6a5dc7d9b000c8b128f7ba99e6a5cc9151b4dcfa doc/install_script.sh
--- a/doc/install_script.sh
+++ b/doc/install_script.sh
@@ -119,6 +119,24 @@
exit 1
fi
DEST_SUFFIX="yt-conda"
+ if [ -n "${PYTHONPATH}" ]
+ then
+ echo "WARNING WARNING WARNING WARNING WARNING WARNING WARNING"
+ echo "*******************************************************"
+ echo
+ echo "The PYTHONPATH environment variable is set to:"
+ echo
+ echo " $PYTHONPATH"
+ echo
+ echo "If dependencies of yt (numpy, scipy, matplotlib) are installed"
+ echo "to this path, this may cause issues. Exit the install script"
+ echo "with Ctrl-C and unset PYTHONPATH if you are unsure."
+ echo "Hit enter to continue."
+ echo
+ echo "WARNING WARNING WARNING WARNING WARNING WARNING WARNING"
+ echo "*******************************************************"
+ read -p "[hit enter]"
+ fi
else
if [ $INST_YT_SOURCE -eq 0 ]
then
@@ -744,6 +762,12 @@
( ${SHASUM} -c $1.sha512 2>&1 ) 1>> ${LOG_FILE} || do_exit
}
+function test_install
+{
+ echo "Testing that yt can be imported"
+ ( ${DEST_DIR}/bin/${PYTHON_EXEC} -c "import yt" 2>&1 ) 1>> ${LOG_FILE} || do_exit
+}
+
ORIG_PWD=`pwd`
if [ -z "${DEST_DIR}" ]
@@ -1238,6 +1262,8 @@
( cp ${YT_DIR}/doc/activate.csh ${DEST_DIR}/bin/activate.csh 2>&1 ) 1>> ${LOG_FILE}
sed -i.bak -e "s,__YT_DIR__,${DEST_DIR}," ${DEST_DIR}/bin/activate.csh
+ test_install
+
function print_afterword
{
echo
@@ -1478,10 +1504,12 @@
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}
+ ( LIBRARY_PATH=$ROCKSTAR_LIBRARY_PATH python setup.py develop 2>&1) 1>> ${LOG_FILE} || do_exit
popd &> /dev/null
fi
+ test_install
+
echo
echo
echo "========================================================================"
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