Merge pull request #3 from bam241/some_fix

Some various fix

Author: nsryan2

macosx.sh

@@ -34,21 +34,22 @@ function build_moab {
               -DCMAKE_INSTALL_PREFIX=${install_dir}/moab
     make
     make install
-    export LD_LIBRARY_PATH=${install_dir}/moab/lib:$LD_LIBRARY_PATH
-    export LIBRARY_PATH=${install_dir}/moab/lib:$LIBRARY_PATH
 
-    echo "export LD_LIBRARY_PATH=${install_dir}/moab/lib:\$LD_LIBRARY_PATH" >> ~/.bashrc
-    echo "export LIBRARY_PATH=${install_dir}/moab/lib:\$LIBRARY_PATH" >> ~/.bashrc
-    echo "export CPLUS_INCLUDE_PATH=${install_dir}/moab/include:\$CPLUS_INCLUDE_PATH" >> ~/.bashrc
-    echo "export C_INCLUDE_PATH=${install_dir}/moab/include:\$C_INCLUDE_PATH" >> ~/.bashrc
+    echo "if [ -n \"\${LD_LIBRARY_PATH-}\" ]" >> ~/.bashrc
+    echo "then" >> ~/.bashrc >> ~/.bashrc
+    echo "  export LD_LIBRARY_PATH=${install_dir}/moab/lib:\$LD_LIBRARY_PATH" >> ~/.bashrc
+    echo "else" >> ~/.bashrc
+    echo "  export LD_LIBRARY_PATH=${install_dir}/moab/lib" >> ~/.bashrc
+    echo "fi" >> ~/.bashrc
 
     PYTHON_VERSION=$(python -c 'import sys; print(sys.version.split('')[0][0:3])')
-    echo "if [ -z \"\$PYTHONPATH\" ]" >> ~/.bashrc
+    echo "if [ -n \"\${PYTHONPATH-}\" ]" >> ~/.bashrc
     echo "then" >> ~/.bashrc >> ~/.bashrc
-    echo "  export PYTHONPATH=$install_dir/moab/lib/python${PYTHON_VERSION}/site-packages" >> ~/.bashrc
-    echo "else" >> ~/.bashrc
     echo "  export PYTHONPATH=$install_dir/moab/lib/python${PYTHON_VERSION}/site-packages:\$PYTHONPATH" >> ~/.bashrc
+    echo "else" >> ~/.bashrc
+    echo "  export PYTHONPATH=$install_dir/moab/lib/python${PYTHON_VERSION}/site-packages" >> ~/.bashrc
     echo "fi" >> ~/.bashrc
+    source ~/.bashrc
 }
 
 function build_dagmc {
@@ -85,37 +86,34 @@ function install_pyne {
     echo "export PATH=$HOME/.local/bin:\$PATH" >> ~/.bashrc
     echo "export LD_LIBRARY_PATH=$HOME/.local/lib:\$LD_LIBRARY_PATH" >> ~/.bashrc
     echo "alias build_pyne='python setup.py install --user -- -DMOAB_LIBRARY=$install_dir/moab/lib -DMOAB_INCLUDE_DIR=$install_dir/moab/include'" >> ~/.bashrc
-PYTHON_VERSION=$(python -c 'import sys; print(sys.version.split('')[0][0:3])')
-echo "  export PYTHONPATH=~/.local/lib/python${PYTHON_VERSION}/site-packages:\$PYTHONPATH" >> ~/.bashrc
+    PYTHON_VERSION=$(python -c 'import sys; print(sys.version.split('')[0][0:3])')
+    echo "if [ -n \"\${PYTHONPATH-}\" ]" >> ~/.bashrc
+    echo "then" >> ~/.bashrc >> ~/.bashrc
+    echo "  export PYTHONPATH=~/.local/lib/python${PYTHON_VERSION}/site-packages:\$PYTHONPATH" >> ~/.bashrc
+    echo "else" >> ~/.bashrc
+    echo "  export PYTHONPATH=~/.local/lib/python${PYTHON_VERSION}/site-packages" >> ~/.bashrc
+    echo "fi" >> ~/.bashrc
 }
 
-function nuc_data_make {
+function run_nuc_data_make {
 
+    cd
+    source ~/.bashrc
     # Generate nuclear data file
-    export LD_LIBRARY_PATH=$HOME/.local/lib:$LD_LIBRARY_PATH
-    ./scripts/nuc_data_make
+    nuc_data_make
 
 }
 
 function test_pyne {
-
+    
+    source ~/.bashrc
+    cd $install_dir/pyne
     cd tests
 
-    # check which python version to run correct tests
-    version=`python -c 'import sys; print(sys.version_info[:][0])'`
-
-    # Run all the tests
-    if [ $version == '2' ] ; then
-        source ./travis-run-tests.sh python2
-    elif [ $version == '3' ] ; then
-        source ./travis-run-tests.sh python3
-    fi
+    nosetests .
 }
 
 
-set -euo pipefail
-IFS=$'\n\t'
-
 # system update
 eval brew update
 eval brew install $brew_package_list
@@ -125,14 +123,11 @@ eval sudo pip3 install $pip_package_list
 install_dir=$HOME/opt
 mkdir -p $install_dir
 
-
 build_moab
 
 install_pyne $1
 
-source ~/.bashrc
-
-nuc_data_make
+run_nuc_data_make
 
 test_pyne $1
 

osx_10.15.6.sh

@@ -15,7 +15,7 @@ brew_package_list="glib python3 wget eigen \
              git cmake vim emacs gcc openblas \
              lapack autoconf libtool make hdf5"
 
-pip_package_list="numpy scipy cython nose tables matplotlib jinja2 \
+pip_package_list="future numpy scipy cython nose tables matplotlib jinja2 \
                   setuptools h5py"