Update iSort to use Black style (triton-inference-server#267)

the-david-oy · web-flow · commit 8c93267e7cae · 2023-07-10T19:35:49.000-07:00
* Add Black profile for isort

* Remove clang-format

* Restore clang-format

* Fix yaml spacing

* Normalize spacing

* Normalize config indentation

* Update line limit in clang-format to 80 chars

* Update workflows to run on every PR
diff --git a/.clang-format b/.clang-format
@@ -2,6 +2,7 @@
 BasedOnStyle: Google
 
 IndentWidth: 2
+ColumnLimit: 80
 ContinuationIndentWidth: 4
 UseTab: Never
 MaxEmptyLinesToKeep: 2
@@ -34,4 +35,4 @@ BinPackArguments: true
 BinPackParameters: true
 ConstructorInitializerAllOnOneLineOrOnePerLine: false
 
-IndentCaseLabels: true
+IndentCaseLabels: true
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -27,13 +27,7 @@
 name: "CodeQL"
 
 on:
-  push:
-    branches: [ 'main' ]
   pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ 'main' ]
-  schedule:
-    - cron: '0 1 * * 1-6'
 
 jobs:
   analyze:
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
@@ -28,8 +28,6 @@ name: pre-commit
 
 on:
   pull_request:
-  push:
-    branches: [main]
 
 jobs:
   pre-commit:
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -33,41 +33,41 @@ repos:
 - repo: https://github.com/psf/black
   rev: 23.1.0
   hooks:
-      - id: black
-        types_or: [python, cython]
+  - id: black
+    types_or: [python, cython]
 - repo: https://github.com/PyCQA/flake8
   rev: 5.0.4
   hooks:
-      - id: flake8
-        args: [--max-line-length=88, --select=C,E,F,W,B,B950, --extend-ignore = E203,E501]
-        types_or: [python, cython]
+  - id: flake8
+    args: [--max-line-length=88, --select=C,E,F,W,B,B950, --extend-ignore = E203,E501]
+    types_or: [python, cython]
 - repo: https://github.com/pre-commit/mirrors-clang-format
   rev: v16.0.5
   hooks:
-      - id: clang-format
-        types_or: [c, c++, cuda, proto, textproto, java]
-        args: ["-fallback-style=none", "-style=file", "-i"]
+  - id: clang-format
+    types_or: [c, c++, cuda, proto, textproto, java]
+    args: ["-fallback-style=none", "-style=file", "-i"]
 - repo: https://github.com/codespell-project/codespell
   rev: v2.2.4
   hooks:
-      - id: codespell
-        additional_dependencies: [tomli]
-        args: ["--toml", "pyproject.toml"]
-        exclude: (?x)^(.*stemmer.*|.*stop_words.*|^CHANGELOG.md$)
+  - id: codespell
+    additional_dependencies: [tomli]
+    args: ["--toml", "pyproject.toml"]
+    exclude: (?x)^(.*stemmer.*|.*stop_words.*|^CHANGELOG.md$)
 # More details about these pre-commit hooks here:
 # https://pre-commit.com/hooks.html
 - repo: https://github.com/pre-commit/pre-commit-hooks
   rev: v4.4.0
   hooks:
-    - id: check-case-conflict
-    - id: check-executables-have-shebangs
-    - id: check-merge-conflict
-    - id: check-json
-    - id: check-toml
-    - id: check-yaml
-    - id: check-shebang-scripts-are-executable
-    - id: end-of-file-fixer
-      types_or: [c, c++, cuda, proto, textproto, java, python]
-    - id: mixed-line-ending
-    - id: requirements-txt-fixer
-    - id: trailing-whitespace
+  - id: check-case-conflict
+  - id: check-executables-have-shebangs
+  - id: check-merge-conflict
+  - id: check-json
+  - id: check-toml
+  - id: check-yaml
+  - id: check-shebang-scripts-are-executable
+  - id: end-of-file-fixer
+    types_or: [c, c++, cuda, proto, textproto, java, python]
+  - id: mixed-line-ending
+  - id: requirements-txt-fixer
+  - id: trailing-whitespace
diff --git a/pyproject.toml b/pyproject.toml
@@ -36,6 +36,7 @@ builtin = "clear"
 quiet-level = 3
 
 [tool.isort]
+profile = "black"
 use_parentheses = true
 multi_line_output = 3
 include_trailing_comma = true
