fix poetry install and setup

Author: jeff-hykin

settings/extensions/nix/nix.toml

@@ -42,9 +42,6 @@
 # 
 # Python
 # 
-[[packages]]
-load = [ "poetry",]
-
 [[packages]]
 load = [ "python38",]
 
@@ -60,6 +57,16 @@ load = [ "python38Packages", "virtualenv",]
 [[packages]]
 load = [ "python38Packages", "wheel",]
 
+[[packages]]
+load = [ "cmake",]
+
+[[packages]]
+load = [ "pkg-config",]
+
+[[packages]]
+load = [ "libffi",]
+
+
 # 
 # for .so errors on linux with opencv+ffmpeg
 # 

settings/extensions/python/commands/ensure_pip_modules

@@ -40,19 +40,28 @@ then
     export FORNIX_FOLDER="$(dirname "$(dirname "$path_to_file")")"
 fi
 
+echo '(which python): '"$(which python)"
+# if poetry not installed, install it
+if ! python -c "import poetry" 2>/dev/null; then
+    python -m pip --disable-pip-version-check install poetry==1.2.1 || python -m pip --disable-pip-version-check install poetry
+fi
 
 # 
-# check for requirements.txt
+# check for python-poetry
 # 
-if [ -f "$FORNIX_FOLDER/requirements.txt" ]
+if [ -f "$FORNIX_FOLDER/pyproject.toml" ] && [ -n "$(command -v "poetry")" ]
 then
     # main inputs
     __temp_var__command_name="tools/python/check_pip_modules"
-    __temp_var__file_to_watch="$FORNIX_FOLDER/requirements.txt"
-    __temp_var__hash_check_name="pip_modules"
+    __temp_var__file_to_watch="$FORNIX_FOLDER/pyproject.toml"
+    __temp_var__hash_check_name="pip_poetry_modules"
     failed_check_command () {
+        # for newer versions of poetry tell them to use the existing virtual env
+        poetry config virtualenvs.path --unset 2>/dev/null
+        poetry config virtualenvs.in-project true 2>/dev/null
+
         # what to do when node modules haven't been installed yet
-        python -m pip --disable-pip-version-check install -r "$__temp_var__file_to_watch"
+        poetry install
         # if successful
         if [ $? -eq 0 ] 
         then
@@ -103,21 +112,17 @@ then
 fi
 
 # 
-# check for python-poetry
+# check for requirements.txt
 # 
-if [ -f "$FORNIX_FOLDER/pyproject.toml" ] && [ -n "$(command -v "poetry")" ]
+if [ -f "$FORNIX_FOLDER/requirements.txt" ]
 then
     # main inputs
     __temp_var__command_name="tools/python/check_pip_modules"
-    __temp_var__file_to_watch="$FORNIX_FOLDER/pyproject.toml"
-    __temp_var__hash_check_name="pip_poetry_modules"
+    __temp_var__file_to_watch="$FORNIX_FOLDER/requirements.txt"
+    __temp_var__hash_check_name="pip_modules"
     failed_check_command () {
-        # for newer versions of poetry tell them to use the existing virtual env
-        poetry config virtualenvs.path --unset 2>/dev/null
-        poetry config virtualenvs.in-project true 2>/dev/null
-
         # what to do when node modules haven't been installed yet
-        poetry install
+        python -m pip --disable-pip-version-check install -r "$__temp_var__file_to_watch"
         # if successful
         if [ $? -eq 0 ] 
         then

settings/extensions/python/commands/setup_venv

@@ -2,7 +2,7 @@
 export TMPDIR="$FORNIX_HOME/tmp.cleanable"
 mkdir -p "$TMPDIR"
 export VIRTUAL_ENV="$FORNIX_FOLDER/.venv"
-export PATH="$VIRTUAL_ENV/bin:$PATH"
+export PATH="$FORNIX_HOME/.local/bin:$PATH"
 if ! [ -d "$VIRTUAL_ENV" ]
 then
     echo "creating virtual env for python"
@@ -11,5 +11,7 @@ then
     python -m venv "$VIRTUAL_ENV" && echo "virtual env created"
 fi
 
+export PATH="$VIRTUAL_ENV/bin:$PATH"
+
 # fix SSL issues
 export SSL_CERT_FILE="$(python -c 'import ssl; print(ssl.get_default_verify_paths().openssl_cafile)')"  

settings/extensions/python/during_purge.sh

@@ -21,4 +21,7 @@ then
     "$FORNIX_FOLDER/settings/extensions/#standard/commands/tools/file_system/remove" "$FORNIX_HOME/.keras"
     "$FORNIX_FOLDER/settings/extensions/#standard/commands/tools/file_system/remove" "$FORNIX_HOME/.local/share/jupyter"
     "$FORNIX_FOLDER/settings/extensions/#standard/commands/tools/file_system/remove" "$FORNIX_HOME/.python_history"
+    "$FORNIX_FOLDER/settings/extensions/#standard/commands/tools/file_system/remove" "$FORNIX_HOME/Library/Application Support/pypoetry"
+    "$FORNIX_FOLDER/settings/extensions/#standard/commands/tools/file_system/remove" "$FORNIX_HOME/Library/Application Support/virtualenv"
+    "$FORNIX_FOLDER/settings/extensions/#standard/commands/tools/file_system/remove" "$FORNIX_HOME/Library/Library/Preferences/pypoetry"
 fi