Biome fixes and prettier cleanup

Author: CoMPaTech

.gitignore

@@ -14,6 +14,5 @@ venv
 *.sedbck
 tmp
 .mypy_cache
-node_modules/
-package-lock.json
 fixtures/updated/*/
+tmp

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 ci:
   # Defer autoupdate to quarterly (there is no 'off' button) to have renovate pick up first
   autoupdate_schedule: quarterly
-  skip: [pylint, markdownlint, testing]
+  skip: [setup, setup_test, pylint, markdownlint, testing]
   submodules: true
 
 default_language_version:
@@ -67,6 +67,14 @@ repos:
       # pyenv and/or virtualenv activated; it may not have been e.g. if
       # committing from a GUI tool that was not launched from an activated
       # shell.
+      - id: setup
+        name: Setup python
+        entry: /usr/bin/env bash -c 'test -d ./venv || scripts/setup.sh'
+        language: script
+      - id: setup_tests
+        name: Setup testing
+        entry: /usr/bin/env bash -c 'test -f ./tmp/biome || scripts/setup_test.sh pre-commit'
+        language: script
       - id: userdata
         name: userdata
         entry: scripts/pre-commit.sh
@@ -92,12 +100,10 @@ repos:
         entry: /usr/bin/env bash -c 'exec env GITHUB_ACTIONS="1" scripts/tests_and_coverage.sh test_and_coverage'
         language: script
         pass_filenames: false
-  - repo: https://github.com/biomejs/pre-commit
-    rev: v0.4.0
-    hooks:
-      - id: biome-lint
-        additional_dependencies: ["@biomejs/[email protected]"]
-        name: "Verifying/updating code with biome (improved prettier)"
+      - id: biome
+        name: "Local Linting - Biome"
+        entry: ./tmp/biome check --staged --files-ignore-unknown=true --no-errors-on-unmatched
+        language: script
   - repo: https://github.com/igorshubovych/markdownlint-cli
     rev: v0.41.0
     hooks:

scripts/python-venv.sh

@@ -6,7 +6,7 @@ my_path=$(git rev-parse --show-toplevel)
 my_venv=${my_path}/venv
 
 # Ensures a python virtualenv is available at the highest available python3 version
-for pv in "${pyversions[@]};"; do
+for pv in "${pyversions[@]}"; do
     if [ "$(which "python$pv")" ]; then
         # If not (yet) available instantiate python virtualenv
         if [ ! -d "${my_venv}" ]; then

scripts/setup.sh

@@ -13,13 +13,10 @@ if [ -f "${my_venv}/bin/activate" ]; then
     . "${my_venv}/bin/activate"
     set -o nounset
     # Install commit requirements
-    pip install wheel
-    pip install --upgrade -e . -r requirements_commit.txt -c https://raw.githubusercontent.com/home-assistant/core/dev/homeassistant/package_constraints.txt -r https://raw.githubusercontent.com/home-assistant/core/dev/requirements_test_pre_commit.txt
+    pip install wheel uv
+    uv pip install --upgrade -e . -r requirements_commit.txt -c https://raw.githubusercontent.com/home-assistant/core/dev/homeassistant/package_constraints.txt -r https://raw.githubusercontent.com/home-assistant/core/dev/requirements_test_pre_commit.txt
     # Install pre-commit hook
     "${my_venv}/bin/pre-commit" install
-    # Prepare node virtualenv and prettier
-    nodeenv -p  # Use node with existing python-virtual env
-    npm install prettier
 else
     echo "Virtualenv available, bailing out"
     exit 2

scripts/setup_test.sh

@@ -11,11 +11,28 @@ if [ -f "${my_venv}/bin/activate" ]; then
     set +o nounset  # Workaround https://github.com/pypa/virtualenv/issues/150 for nodeenv
     # shellcheck disable=SC1091
     . "${my_venv}/bin/activate"
+    mkdir -p ./tmp
     set -o nounset
     # Install test requirements
-    pip install --upgrade -e . -r requirements_test.txt -c https://raw.githubusercontent.com/home-assistant/core/dev/homeassistant/package_constraints.txt -r https://raw.githubusercontent.com/home-assistant/core/dev/requirements_test.txt -r https://raw.githubusercontent.com/home-assistant/core/dev/requirements_test_pre_commit.txt
-    # Install pre-commit hook
-    "${my_venv}/bin/pre-commit" install
+    uv pip install --upgrade -e . -r requirements_test.txt -c https://raw.githubusercontent.com/home-assistant/core/dev/homeassistant/package_constraints.txt -r https://raw.githubusercontent.com/home-assistant/core/dev/requirements_test.txt -r https://raw.githubusercontent.com/home-assistant/core/dev/requirements_test_pre_commit.txt
+    # Prepare biomejs
+    echo "Fetching/updating biome cli"
+    if uname -a | grep -q arm64; then
+      curl -sL "https://github.com/biomejs/biome/releases/latest/download/biome-darwin-arm64" -o "${my_path}/tmp/biome"
+    elif uname -a | grep -q x86_64; then
+      curl -sL "https://github.com/biomejs/biome/releases/latest/download/biome-linux-x64" -o "${my_path}/tmp/biome"
+    else
+      echo "Unable to determine processor and as such to install packaged biome cli version, bailing out"
+      exit 2
+    fi
+
+    # Make biome executable (if necessary)
+    chmod +x "${my_path}/tmp/biome"
+
+    # Install pre-commit hook unless running from within pre-commit
+    if [ "$#" -eq 0 ]; then
+      "${my_venv}/bin/pre-commit" install
+    fi
 else
     echo "Virtualenv available, bailing out"
     exit 2

scripts/tests_and_coverage.sh

@@ -43,15 +43,13 @@ if [ -z "${GITHUB_ACTIONS}" ] || [ "$1" == "linting" ] ; then
     pylint plugwise/ tests/
 fi
 
-# As to not generated fixtures, leaving prettier to re-do them
+# As to not generated fixtures, leaving biome to re-do them
 # so no auto-generation during github run of testing
 # Creating todo #313 to 'gracefully' do this on merge on github action
 if [ -z "${GITHUB_ACTIONS}" ] || [ "$1" == "fixtures" ] ; then
     echo "... crafting manual fixtures ..." 
     PYTHONPATH=$(pwd) python3 scripts/manual_fixtures.py
-    echo "... prettier-ing (fixtures and testdata) ..." 
-    npx prettier --write --list-different --ignore-unknown --log-level silent fixtures/ tests/data
-else
-    echo "... prettier-ing (fixtures and testdata) ..." 
-    npx prettier --write --list-different --ignore-unknown --log-level silent fixtures/ tests/data
 fi
+echo "... biome-ing (fixtures and testdata) ..." 
+./tmp/biome lint fixtures/ tests/data/
+#npx prettier --write --list-different --ignore-unknown --log-level silent fixtures/ tests/data