Merge branch 'node' into pnpm

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/#standard/commands/tools/fornix/merge_all_templates

@@ -4,15 +4,16 @@ gc python_package    && gm python && gp && \
 gc python_notebook   && gm python && gp && \
 gc node              && gm python && gp && \
 gc quik_github_pages && gm master && gp && \
-gc npm_package       && gm master && gp && \
+gc npm_package       && gm node   && gp && \
 gc deno_package      && gm master && gp && \
-gc pnpm              && gm master && gp && \
+gc pnpm              && gm node   && gp && \
 gc electron          && gm master && gp && \
 gc prolog            && gm master && gp && \
 gc ruby              && gm master && gp && \
 gc rust              && gm master && gp && \
 gc rust_druid        && gm rust   && gp && \
 gc rust_tauri        && gm rust   && gp && \
-gc textmate          && gm master && gp && \
+gc textmate          && gm node   && gp && \
+gc textmate          && gm ruby   && gp && \
 gc crystal           && gm master && gp && \
-gc master
+gc master

settings/extensions/nix/nix.toml

@@ -72,30 +72,30 @@ from = "860b56be91fb874d48e23a950815969a7b832fbc"
 # 
 # Python (because node-gyp depends on python)
 # 
-
 [[packages]]
 load = [ "python38",]
-from = "3f50332bc4913a56ad216ca01f5d0bd24277a6b2"
 
 [[packages]]
 load = [ "python38Packages", "setuptools",]
-from = "3f50332bc4913a56ad216ca01f5d0bd24277a6b2"
 
 [[packages]]
 load = [ "python38Packages", "pip",]
-from = "3f50332bc4913a56ad216ca01f5d0bd24277a6b2"
 
 [[packages]]
 load = [ "python38Packages", "virtualenv",]
-from = "3f50332bc4913a56ad216ca01f5d0bd24277a6b2"
 
 [[packages]]
 load = [ "python38Packages", "wheel",]
-from = "3f50332bc4913a56ad216ca01f5d0bd24277a6b2"
 
 [[packages]]
-load = [ "poetry",]
-from = "3f50332bc4913a56ad216ca01f5d0bd24277a6b2"
+load = [ "cmake",]
+
+[[packages]]
+load = [ "pkg-config",]
+
+[[packages]]
+load = [ "libffi",]
+
 
 # 
 # for .so errors on linux with opencv+ffmpeg

settings/extensions/nodejs/commands/check_node_modules

@@ -61,8 +61,10 @@ failed_check_command () {
     if [ $? -eq 0 ] 
     then
         echo "[$__temp_var__command_name] Check finished (dependencies installed)"
+        return 0
     else
         echo "[$__temp_var__command_name] Check failed: issues with $__temp_var__executable install"
+        return 1
     fi
 }
 
@@ -88,13 +90,11 @@ if [ -f "$__temp_var__file_to_watch" ]; then
     __temp_var__new_hash="$(cat "$__temp_var__file_to_watch" | md5sum)"
     # if something changed since last time; install!
     if [[ "$__temp_var__old_hash" != "$__temp_var__new_hash" ]]; then
-        echo "$__temp_var__new_hash" > "$__temp_var__location_of_hash"
-        failed_check_command
+        failed_check_command && echo "$__temp_var__new_hash" > "$__temp_var__location_of_hash"
     else
         # CUSTOM check, if nothing is installed (after clean/purge) then install!
         if ! [[ -d "$FORNIX_FOLDER/node_modules" ]]; then
-            echo "$__temp_var__new_hash" > "$__temp_var__location_of_hash"
-            failed_check_command
+            failed_check_command && echo "$__temp_var__new_hash" > "$__temp_var__location_of_hash"
             mkdir -p "$FORNIX_FOLDER/node_modules"
         else
             echo "[$__temp_var__command_name] Check Passed => assuming packages are installed"

settings/extensions/python/commands/add_project_to_pythonpath

@@ -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
@@ -51,15 +55,21 @@ then
     __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
         poetry install
         # if successful
         if [ $? -eq 0 ] 
         then
             echo "[$__temp_var__command_name] Check finished (dependencies installed)"
+            return 0
         # if failed
         else
             echo "[$__temp_var__command_name] Check failed: issues with install"
+            return 1
         fi
     }
 
@@ -84,8 +94,7 @@ then
         __temp_var__new_hash="$(cat "$__temp_var__file_to_watch" | md5sum)"
         # if something changed since last time; install!
         if [ "$__temp_var__old_hash" != "$__temp_var__new_hash" ]; then
-            echo "$__temp_var__new_hash" > "$__temp_var__location_of_hash"
-            failed_check_command
+            failed_check_command && echo "$__temp_var__new_hash" > "$__temp_var__location_of_hash"
         else
             echo "[$__temp_var__command_name] Check Passed => assuming packages are installed"
         fi
@@ -117,9 +126,11 @@ then
         if [ $? -eq 0 ] 
         then
             echo "[$__temp_var__command_name] Check finished (dependencies installed)"
+            return 0
         # if failed
         else
             echo "[$__temp_var__command_name] Check failed: issues with install"
+            return 1
         fi
     }
 
@@ -144,8 +155,7 @@ then
         __temp_var__new_hash="$(cat "$__temp_var__file_to_watch" | md5sum)"
         # if something changed since last time; install!
         if [ "$__temp_var__old_hash" != "$__temp_var__new_hash" ]; then
-            echo "$__temp_var__new_hash" > "$__temp_var__location_of_hash"
-            failed_check_command
+            failed_check_command && echo "$__temp_var__new_hash" > "$__temp_var__location_of_hash"
         else
             echo "[$__temp_var__command_name] Check Passed => assuming packages are installed"
         fi
@@ -159,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/ensure_pip_modules

@@ -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/commands/refresh_ignores

@@ -12,6 +12,7 @@ then
 
     # all the home folder junk from python and common pip modules
     "$FORNIX_FOLDER/settings/extensions/#standard/commands/tools/file_system/remove" "$FORNIX_HOME/.cache/pip"
+    "$FORNIX_FOLDER/settings/extensions/#standard/commands/tools/file_system/remove" "$FORNIX_HOME/.cache/pypoetry/"
     "$FORNIX_FOLDER/settings/extensions/#standard/commands/tools/file_system/remove" "$FORNIX_HOME/.local/share/virtualenv"
     "$FORNIX_FOLDER/settings/extensions/#standard/commands/tools/file_system/remove" "$FORNIX_HOME/.config/pypoetry"
     "$FORNIX_FOLDER/settings/extensions/#standard/commands/tools/file_system/remove" "$FORNIX_HOME/.config/matplotlib"
@@ -20,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