Remove use of yq (#908)

# Pull Request ## Title Remove use of yq. --- ## Description Removes the use of yq which doesn't always exist and running it via conda apparently has issues. --- ## Type of Change - 🛠️ Bug fix --- ## Testing CI --- ## Additional Notes (optional) Fixes a bug introduced in #904 ---
microsoft · Jan 4, 2025 · edb0a7c · edb0a7c
1 parent 795d1b0
commit edb0a7c
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -71,9 +71,9 @@ FORMAT_COMMON_PREREQS := build/conda-env.${CONDA_ENV_NAME}.build-stamp
 FORMAT_COMMON_PREREQS += .pre-commit-config.yaml
 FORMAT_COMMON_PREREQS += $(MLOS_GLOBAL_CONF_FILES)
 
-# Formatting pre-commit hooks are marked with the "manual" stage.
-FORMATTERS := $(shell cat .pre-commit-config.yaml | yq -r '.repos[].hooks[] | select((.stages // []) | contains(["manual"])) | .id')
-CHECKERS := $(shell cat .pre-commit-config.yaml | yq -r '.repos[].hooks[] | select((.stages // []) | contains(["manual"]) | not) | .id')
+# Formatting pre-commit hooks are marked with the "manual" stage in .pre-commit-config.yaml
+# Since yq is not installed everywhere we need to sync the list here as well.
+FORMATTERS := end-of-file-fixer pretty-format-json trailingwhitespace licenseheaders pyupgrade isort black docformatter
 
 # Provide convenience methods to call individual formatters and checkers via `make` as well.
 # e.g., `make black` or `make pylint`

diff --git a/conda-envs/mlos-3.10.yml b/conda-envs/mlos-3.10.yml
@@ -5,7 +5,6 @@ channels:
 dependencies:
   # Basic dev environment packages.
   # All other dependencies for the mlos modules come from pip.
-  - yq
   - pip
   - python-build
   - jupyter

diff --git a/conda-envs/mlos-3.11.yml b/conda-envs/mlos-3.11.yml
@@ -5,7 +5,6 @@ channels:
 dependencies:
   # Basic dev environment packages.
   # All other dependencies for the mlos modules come from pip.
-  - yq
   - pip
   - python-build
   - jupyter

diff --git a/conda-envs/mlos-3.12.yml b/conda-envs/mlos-3.12.yml
@@ -7,7 +7,6 @@ channels:
 dependencies:
   # Basic dev environment packages.
   # All other dependencies for the mlos modules come from pip.
-  - yq
   - pip
   - python-build
   - jupyter

diff --git a/conda-envs/mlos-3.13.yml b/conda-envs/mlos-3.13.yml
@@ -7,7 +7,6 @@ channels:
 dependencies:
   # Basic dev environment packages.
   # All other dependencies for the mlos modules come from pip.
-  - yq
   - pip
   - python-build
   - jupyter

diff --git a/conda-envs/mlos-windows.yml b/conda-envs/mlos-windows.yml
@@ -6,7 +6,6 @@ channels:
 dependencies:
   # Basic dev environment packages.
   # All other dependencies for the mlos modules come from pip.
-  - yq
   - pip
   - python-build
   - jupyter

diff --git a/conda-envs/mlos.yml b/conda-envs/mlos.yml
@@ -5,7 +5,6 @@ channels:
 dependencies:
   # Basic dev environment packages.
   # All other dependencies for the mlos modules come from pip.
-  - yq
   - pip
   - python-build
   - jupyter