move to a central config file in the form of a pyproject.toml

Author: albu-diku

.isort.cfg

@@ -6,9 +6,7 @@ ifndef PY
 	PY = 3
 endif
 
-FORMAT_ENFORCE_DIRS = ./bin ./mig/lib ./sbin ./tests
-FORMAT_EXCLUDE_REGEX = '.git|tests/data/|tests/fixture/|bin/checkconf.py|bin/createresource.py|bin/notifypassword.py|sbin/grid\_ftps.py|sbin/grid\_openid.py|sbin/grid\_sftp.py|sbin/grid\_webdavs.py'
-FORMAT_LINE_LENGTH = 80
+LINT_ENFORCE_DIRS = ./bin ./mig/lib ./sbin ./tests
 LOCAL_PYTHON_BIN = './envhelp/lpython'
 
 ifdef PYTHON_BIN
@@ -40,14 +38,10 @@ ifneq ($(MIG_ENV),'local')
 endif
 	@make format-python
 
-.PHONY:format-python
+.PHONY: format-python
 format-python:
-	@$(LOCAL_PYTHON_BIN) -m black $(FORMAT_ENFORCE_DIRS) \
-			--line-length=$(FORMAT_LINE_LENGTH) \
-			--exclude=$(FORMAT_EXCLUDE_REGEX)
-	@$(LOCAL_PYTHON_BIN) -m isort $(FORMAT_ENFORCE_DIRS) \
-			--profile=black \
-			--line-length=$(FORMAT_LINE_LENGTH)
+	@$(LOCAL_PYTHON_BIN) -m black $(LINT_ENFORCE_DIRS)
+	@$(LOCAL_PYTHON_BIN) -m isort $(LINT_ENFORCE_DIRS)
 
 .PHONY: lint
 lint:
@@ -59,15 +53,8 @@ endif
 
 .PHONY: lint-python
 lint-python:
-	@$(LOCAL_PYTHON_BIN) -m black $(FORMAT_ENFORCE_DIRS) \
-			--check \
-			--line-length=$(FORMAT_LINE_LENGTH) \
-			--exclude $(FORMAT_EXCLUDE_REGEX)
-	@$(LOCAL_PYTHON_BIN) -m isort $(FORMAT_ENFORCE_DIRS) \
-			--check-only \
-			--profile=black \
-			--line-length=$(FORMAT_LINE_LENGTH) \
-			--skip-glob=$(FORMAT_EXCLUDE_GLOB)
+	@$(LOCAL_PYTHON_BIN) -m black $(LINT_ENFORCE_DIRS) --check
+	@$(LOCAL_PYTHON_BIN) -m isort $(LINT_ENFORCE_DIRS) --check-only
 
 .PHONY: clean
 clean:

Makefile

@@ -0,0 +1,32 @@
+# Project wide settings including tooling.
+
+# Linting tools
+# TODO: fix CodeQL errors in the symlinked files and disable exclude+skip here
+
+[tool.black]
+line-length = 80
+# NOTE: the following regex matches us be kept in sync with isort skip
+extend-exclude = '''
+      tests/data/
+    | tests/fixture/
+    | bin/checkconf.py
+    | bin/createresource.py
+    | bin/notifypassword.py
+    | sbin/grid_ftps.py|sbin/grid_openid.py
+    | sbin/grid_sftp.py|sbin/grid_webdavs.py
+'''
+
+[tool.isort]
+profile = "black"
+line_length = 80
+# NOTE: the following paths must be kept in sync with black extend-exclude
+skip = [
+    "bin/notifypassword.py",
+    "bin/checkconf.py",
+    "bin/createresource.py",
+    "sbin/grid_ftps.py",
+    "sbin/grid_openid.py",
+    "sbin/grid_sftp.py",
+    "sbin/grid_webdavs.py"
+]
+skip_glob = [".git/*", "tests/data/*", "tests/fixture/*"]