diff --git a/bin/komrade-activate b/bin/komrade-activate new file mode 100644 index 0000000..da63bf2 --- /dev/null +++ b/bin/komrade-activate @@ -0,0 +1,10 @@ + +export KOMRADE_SHOW_LOG=0 + +SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" +pathvenv=`realpath "$SCRIPTPATH/../venv"` +pathconda=`realpath "$SCRIPTPATH/../../lib/miniconda3"` + +export PATH="$pathconda/bin:$PATH" + +conda activate "$pathvenv" diff --git a/komrade/backend/None/NzcwN2ZkZDJlODEyYmFmMmY2ODY4MzVjNDFjMDQ5NWNkMDIyZTE3ZTEwOTRkMTNkYjUyZTFhNjliM2MxZWIzMw== b/komrade/backend/None/NzcwN2ZkZDJlODEyYmFmMmY2ODY4MzVjNDFjMDQ5NWNkMDIyZTE3ZTEwOTRkMTNkYjUyZTFhNjliM2MxZWIzMw== deleted file mode 100644 index 79cca9f..0000000 Binary files a/komrade/backend/None/NzcwN2ZkZDJlODEyYmFmMmY2ODY4MzVjNDFjMDQ5NWNkMDIyZTE3ZTEwOTRkMTNkYjUyZTFhNjliM2MxZWIzMw== and /dev/null differ diff --git a/komrade/backend/tes22t.db b/komrade/backend/tes22t.db deleted file mode 100644 index fce4ab7..0000000 Binary files a/komrade/backend/tes22t.db and /dev/null differ diff --git a/komrade/backend/test.db b/komrade/backend/test.db deleted file mode 100644 index a29cdf3..0000000 Binary files a/komrade/backend/test.db and /dev/null differ diff --git a/script/install b/script/install index e737081..65a7e06 100644 --- a/script/install +++ b/script/install @@ -156,7 +156,7 @@ path_venv="$path_repo/venv" # cd $path_komrade cd $path_repo echo "Now using python 1: `which python`" -$condaexec create -p "$path_venv" python=3.7 cartopy pip virtualenv +$condaexec create -y -p "$path_venv" python=3.7 cartopy pip virtualenv $condaexec activate "$path_venv" echo "Now using python 2: `which python`" # $pythonexec -m pip install virtualenv