Merge pull request #1252 from tychtjan/JTYC-GDAI-996-fix-lint

fix: (MCP ruler) unifying lint, format, check for python validation

Author: jaceksan

Makefile

@@ -13,6 +13,9 @@ URL="${BASE_URL}/api/${API_VERSION}/schemas"
 
 include ci_tests.mk
 
+# Common command components
+RUFF = .venv/bin/ruff
+
 all:
 	echo "Nothing here yet."
 
@@ -23,24 +26,23 @@ dev:
 
 .PHONY: lint
 lint:
-	.venv/bin/ruff check .
+	$(RUFF) check .
 
 .PHONY: lint-fix
 lint-fix:
-	.venv/bin/ruff check . --fix
+	$(RUFF) check . --fix
 
 .PHONY: format
 format:
-	.venv/bin/ruff format --check .
-
-.PHONY: format-diff
-format-diff:
-	.venv/bin/ruff format --diff .
+	$(RUFF) format --check .
 
 .PHONY: format-fix
 format-fix:
-	.venv/bin/ruff format .
-	.venv/bin/ruff check . --fix --fixable I
+	$(RUFF) format .
+
+.PHONY: format-diff
+format-diff:
+	$(RUFF) format --diff .
 
 
 define download_client
@@ -51,8 +53,6 @@ define generate_client
 	./scripts/generate_client.sh gooddata-$(1)-client -f "/local/schemas/gooddata-$(1)-client.json"
 endef
 
-
-
 .PHONY: api-client
 api-client: download
 	rm -f schemas/gooddata-api-client.json

project_common.mk

@@ -1,4 +1,10 @@
 # (C) 2021 GoodData Corporation
+
+# Common command components (run from workspace root, scoped to this package)
+ROOT_DIR = ../..
+RUFF = $(ROOT_DIR)/.venv/bin/ruff
+PKG_PATH = packages/$(CURR_DIR_BASE_NAME)
+
 TOX_FLAGS =
 ifeq (1,$(RECREATE_ENVS))
   TOX_FLAGS += -r
@@ -14,7 +20,6 @@ ifdef ADD_ARGS
 	LOCAL_ADD_ARGS := -- $(ADD_ARGS)
 endif
 
-
 # linting and formatting tools have configuration in root dir to support pre-commit - use it
 # ruff uses root directory to have the same per-file-ignores config parameter for all packages
 CURR_DIR_BASE_NAME = $(notdir $(CURDIR))
@@ -23,18 +28,25 @@ CURR_DIR_BASE_NAME = $(notdir $(CURDIR))
 all:
 	echo "Nothing here yet."
 
+.PHONY: lint
+lint:
+	(cd $(ROOT_DIR); $(RUFF) check $(PKG_PATH))
+
+.PHONY: lint-fix
+lint-fix:
+	(cd $(ROOT_DIR); $(RUFF) check $(PKG_PATH) --fix)
+
 .PHONY: format
 format:
-	(cd ../..; .venv/bin/ruff format --check packages/$(CURR_DIR_BASE_NAME))
-
-.PHONY: format-diff
-format-diff:
-	(cd ../..; .venv/bin/ruff format --diff packages/$(CURR_DIR_BASE_NAME))
+	(cd $(ROOT_DIR); $(RUFF) format --check $(PKG_PATH))
 
 .PHONY: format-fix
 format-fix:
-	(cd ../..; .venv/bin/ruff format packages/$(CURR_DIR_BASE_NAME))
-	(cd ../..; .venv/bin/ruff check --fix packages/$(CURR_DIR_BASE_NAME))
+	(cd $(ROOT_DIR); $(RUFF) format $(PKG_PATH))
+
+.PHONY: format-diff
+format-diff:
+	(cd $(ROOT_DIR); $(RUFF) format --diff $(PKG_PATH))
 
 .PHONY: mypy
 mypy: