diff --git a/analyzer/pyproject.toml b/analyzer/pyproject.toml index 571f62982..b1e19ba1a 100644 --- a/analyzer/pyproject.toml +++ b/analyzer/pyproject.toml @@ -1,3 +1,7 @@ +[tool.isort] +profile = "black" +combine_as_imports = true + [tool.pylint.messages_control] extension-pkg-whitelist = "pydantic" disable = [ diff --git a/api-client/pyproject.toml b/api-client/pyproject.toml index 3a9b526df..1cb6facee 100644 --- a/api-client/pyproject.toml +++ b/api-client/pyproject.toml @@ -1,3 +1,7 @@ +[tool.isort] +profile = "black" +combine_as_imports = true + [tool.pylint.messages_control] extension-pkg-whitelist = "pydantic" disable = [ diff --git a/api/pyproject.toml b/api/pyproject.toml index b2c2c36c9..a320991ec 100644 --- a/api/pyproject.toml +++ b/api/pyproject.toml @@ -1,3 +1,7 @@ +[tool.isort] +profile = "black" +combine_as_imports = true + [tool.pylint.master] load-plugins = "pylint_django" django-settings-module = "libretime_api.settings.testing" diff --git a/playout/pyproject.toml b/playout/pyproject.toml index 3222b65b8..f6658c509 100644 --- a/playout/pyproject.toml +++ b/playout/pyproject.toml @@ -1,3 +1,7 @@ +[tool.isort] +profile = "black" +combine_as_imports = true + [tool.pylint.messages_control] extension-pkg-whitelist = [ "lxml.etree", diff --git a/shared/pyproject.toml b/shared/pyproject.toml index 2dd7612ab..f8e51df5b 100644 --- a/shared/pyproject.toml +++ b/shared/pyproject.toml @@ -1,3 +1,7 @@ +[tool.isort] +profile = "black" +combine_as_imports = true + [tool.pylint.messages_control] extension-pkg-whitelist = "pydantic" disable = [ diff --git a/tools/pyproject.toml b/tools/pyproject.toml index 538f9969d..6aec18512 100644 --- a/tools/pyproject.toml +++ b/tools/pyproject.toml @@ -1,3 +1,7 @@ +[tool.isort] +profile = "black" +combine_as_imports = true + [tool.pylint.messages_control] extension-pkg-whitelist = "pydantic" disable = [ diff --git a/tools/python.mk b/tools/python.mk index 027f6a105..f0ee2c5d9 100644 --- a/tools/python.mk +++ b/tools/python.mk @@ -34,12 +34,12 @@ install: $(VENV) .PHONY: .format .format: $(VENV) $(VENV)/bin/black . - $(VENV)/bin/isort . --combine-as --profile black + $(VENV)/bin/isort . .PHONY: .format-check .format-check: $(VENV) $(VENV)/bin/black . --check - $(VENV)/bin/isort . --combine-as --profile black --check + $(VENV)/bin/isort . --check .PHONY: .pylint .pylint: $(VENV) diff --git a/worker/pyproject.toml b/worker/pyproject.toml index d394870e9..89fecd302 100644 --- a/worker/pyproject.toml +++ b/worker/pyproject.toml @@ -1,3 +1,7 @@ +[tool.isort] +profile = "black" +combine_as_imports = true + [tool.pylint.messages_control] extension-pkg-whitelist = "pydantic" disable = [