diff --git a/README.md b/README.md index 3556cea7c..dcc84a92f 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,7 @@ +**master:** +![example workflow](https://github.com/RagnarB83/ash/actions/workflows/python-app-conda.yml/badge.svg) +**NEW:** +![example branch parameter](https://github.com/RagnarB83/ash/actions/workflows/python-app-conda.yml/badge.svg?branch=NEW) drawing diff --git a/ash/functions/functions_general.py b/ash/functions/functions_general.py index 64a934d57..2efbafc15 100644 --- a/ash/functions/functions_general.py +++ b/ash/functions/functions_general.py @@ -7,6 +7,7 @@ import math import shutil import re +import atexit import ash.settings_ash from ash import ashpath @@ -55,16 +56,19 @@ def create_ash_env_file(): export PATH=$python3path:$ASHPATH:$JULIAPATH:$PATH export LD_LIBRARY_PATH=$ASHPATH/ash/lib:$LD_LIBRARY_PATH -echo " Sourced ASH environment file!" +echo "Sourced ASH environment file!" echo "Importing ASH within Python should now work!" +echo "ASH is located in $ASHPATH" +echo "The Python interpreter that you should be using is located in $python3path" """ with open(f"{os.path.expanduser('~')}/set_environment_ash.sh", "w") as f: f.write(ash_multiline_string) print("Created file: set_environment_ash.sh in your home-directory.") - print("Sourcing this file will activate ASH for your current shell session:") + print("Sourcing this file (in your shell) will activate ASH for future shell sessions:") print("source ~/set_environment_ash.sh") - print("You can add this line in your ~/.bashrc (or ~/.bash_profile or ~/.zshrc) or job-submission script") - + print() + print("You can add this line to your ~/.bashrc (or ~/.bash_profile or ~/.zshrc) and job-submission script") + exit() # Julia load interface diff --git a/conda_setup_ash.sh b/conda_setup_ash.sh deleted file mode 100755 index 9c6c82151..000000000 --- a/conda_setup_ash.sh +++ /dev/null @@ -1,46 +0,0 @@ -#WARNING: PROBABLY OUTDATED SCRIPT -#KEPT ONLY FOR REFERENCE -#SEE https://ash.readthedocs.io/en/latest/setup.html FOR LATEST INSTALLATION INSTRUCTIONS -exit -echo "Searching for python3 in PATH" -path_to_python3_exe=$(which python3) -path_to_julia_exe=$(which julia) -#Check if fou - if [ $? -eq 1 ] - then - echo "Did not find a python3 executable in PATH. Put a Python3 installation in PATH (or load a module)" - exit - fi - echo "Found: $path_to_python3_exe" - -#Dirname only -path_to_python3_dir=${path_to_python3_exe%/python3} -path_to_julia_dir=${path_to_julia_exe%/julia} -echo "" -echo "Python3 path: $path_to_python3_dir" -echo "Julia path: $path_to_julia_dir" -echo "" - -#The parent dir containing the ash dir -ash_parent_dir=$(dirname "$PWD") -ash_dir=$PWD - - -#Create set_environment_ash.sh file -echo "Creating set_environent_ash.sh script" -echo "#!/bin/bash" > set_environment_ash.sh -echo "ulimit -s unlimited" >> set_environment_ash.sh -echo "export ASHPATH=${ash_parent_dir}" >> set_environment_ash.sh -echo "export python3path=${path_to_python3_dir}" >> set_environment_ash.sh -echo "export JULIAPATH=${path_to_julia_dir}" >> set_environment_ash.sh -#echo "export JULIA_DEPOT_PATH=${ash_dir}/julia-python-bundle" >> set_environment_ash.sh -echo "export PYTHONPATH=\$ASHPATH:\$ASHPATH/ash/lib:\$PYTHONPATH" >> set_environment_ash.sh -echo "export PATH=\$python3path:\$ASHPATH:\$JULIAPATH:\$PATH" >> set_environment_ash.sh -echo "export LD_LIBRARY_PATH=\$ASHPATH/ash/lib:\$LD_LIBRARY_PATH" >> set_environment_ash.sh - - -echo "Installation of ASH was successful!" -echo "" -echo "Remember:" -echo " - Run: source ${thisdir}/set_environment_ash.sh to activate ASH!" -echo " - Put source command in your .bash_profile/.zshrc/.bashrc and job-submission scripts" \ No newline at end of file diff --git a/nonconda_install_ash.sh b/nonconda_install_ash.sh index c87f76f00..15e5b493a 100644 --- a/nonconda_install_ash.sh +++ b/nonconda_install_ash.sh @@ -1,6 +1,6 @@ #!/bin/bash -#WARNING: PROBABLY OUTDATED SCRIPT +#WARNING: OUTDATED SCRIPT #KEPT ONLY FOR REFERENCE #SEE https://ash.readthedocs.io/en/latest/setup.html FOR LATEST INSTALLATION INSTRUCTIONS exit diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index f547d3a1e..000000000 --- a/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -numpy==1.26 -geometric==1.0.1 \ No newline at end of file