Merge branch 'python' of github.com:jeff-hykin/fornix

Author: jeff-hykin

pyproject.toml

@@ -6,7 +6,6 @@ authors = [""]
 
 [tool.poetry.dependencies]
 python = ">=3.7,<3.10"
-pip = "20.1.1"
 
 [tool.poetry.dev-dependencies]
 

settings/extensions/nix/nix.toml

@@ -70,7 +70,6 @@ load = [ "nodePackages", "pnpm", ]
 # 
 # Python (because node-gyp depends on python)
 # 
-
 [[packages]]
 load = [ "python38",]
 
@@ -87,7 +86,14 @@ load = [ "python38Packages", "virtualenv",]
 load = [ "python38Packages", "wheel",]
 
 [[packages]]
-load = [ "poetry",]
+load = [ "cmake",]
+
+[[packages]]
+load = [ "pkg-config",]
+
+[[packages]]
+load = [ "libffi",]
+
 
 
 # 

settings/extensions/python/commands/ensure_pip_modules

@@ -40,9 +40,13 @@ then
     export FORNIX_FOLDER="$(dirname "$(dirname "$path_to_file")")"
 fi
 
+# 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 python-poetry first
+# check for python-poetry
 # 
 if [ -f "$FORNIX_FOLDER/pyproject.toml" ] && [ -n "$(command -v "poetry")" ]
 then
@@ -165,4 +169,7 @@ then
     unset __temp_var__command_name
     unset __temp_var__file_to_watch
     unset __temp_var__hash_check_name
-fi
+fi
+
+# fix for https://askubuntu.com/questions/441744/pressing-enter-produces-m-instead-of-a-newline
+stty sane

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