Comfy-Org · telamonian · Aug 20, 2024 · Aug 2, 2024 · Aug 2, 2024 · Aug 2, 2024
diff --git a/.github/workflows/pylint.yml → .github/workflows/ruff_check.yml b/.github/workflows/pylint.yml → .github/workflows/ruff_check.yml
@@ -1,4 +1,4 @@
-name: Lint
+name: ruff_check
 
 on:
   push:
@@ -9,18 +9,19 @@ on:
       - main
 
 jobs:
-  lint:
+  ruff_check:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
           python-version: "3.x"
-      - name: Install dependencies
+      - name: install ruff
         run: |
           python -m pip install --upgrade pip
-          pip install -r requirements.txt
-          pip install pylint
-      - name: Lint with Pylint
-        run: pylint --disable=R **/*.py
+          pip install ruff
+      - name: lint check and then format check with ruff
+        run: |
+          ruff check
+          ruff format --check
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@ __pycache__/
 
 #COMMON CONFIGs
 .DS_Store
+.ruff_cache
 .src_port
 .webpack_watch.log
 *.swp

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,17 +1,10 @@
 repos:
-  - repo: https://github.com/psf/black
-    rev: 22.3.0
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    # Ruff version.
+    rev: v0.6.1
     hooks:
-      - id: black
-  - repo: https://github.com/pylint-dev/pylint
-    rev: v2.16.2
-    hooks:
-      - id: pylint
-        args:
-          # Note: E0401 is disabled as pylint does not run in an environment
-          # where the package is installed
-          - --disable=R,E0401
-  - repo: https://github.com/PyCQA/isort
-    rev: 5.13.2
-    hooks:
-      - id: isort
+      # Run the linter.
+      - id: ruff
+        args: [ --fix ]
+      # Run the formatter.
+      - id: ruff-format
diff --git a/.pylintrc b/.pylintrc
@@ -1,30 +1,28 @@
-[MASTER]
-disable=
-    C0114, # missing-module-docstring
-    C0115, # missing-class-docstring
-    C0116, # missing-function-docstring
-    C0209, # consider-using-f-string
-    W0622, # redefined-builtin
-    W1113, # too-many-arguments
-    W0613, # unused-argument
-    W0718, # broad-exception-caught
-    W0511, # fixme
-    W0621, # redefined-outer-name
-    W1514, # unspecified-encoding
-    W0603, # global-statement
-    W1203, # logging-fstring-interpolation
-    W0212, # protected-access
-    C0301, # line-too-long
-    C0103, # invalid-name
-    W1510, # subprocess-run-check
-    W0707, # raise-missing-from
+; [MASTER]
+; disable=
+;     C0114, # missing-module-docstring
+;     C0115, # missing-class-docstring
+;     C0116, # missing-function-docstring
+;     C0209, # consider-using-f-string
+;     W0622, # redefined-builtin
+;     W1113, # too-many-arguments
+;     W0613, # unused-argument
+;     W0718, # broad-exception-caught
+;     W0511, # fixme
+;     W0621, # redefined-outer-name
+;     W1514, # unspecified-encoding
+;     W0603, # global-statement
+;     W1203, # logging-fstring-interpolation
+;     W0212, # protected-access
+;     C0301, # line-too-long
+;     W0707, # raise-missing-from
 
-    # TODO
-    W3101, # missing timeout on request
-    W0719, # broad-exception-raised
+;     # TODO
+;     W3101, # missing timeout on request
+;     W0719, # broad-exception-raised
 
-[FORMAT]
-max-line-length=120
+; [FORMAT]
+; max-line-length=120
 
-[SIMILARITIES]
-ignore-imports=yes
+; [SIMILARITIES]
+; ignore-imports=yes
diff --git a/pylint_formatter.sh b/pylint_formatter.sh
diff --git a/pyproject.toml b/pyproject.toml
@@ -15,31 +15,38 @@ maintainers = [
   {name = "Yoland Yan", email = "yoland@drip.art"},
   {name = "James Kwon", email = "hongilkwon316@gmail.com"},
   {name = "Robin Huang", email = "robin@drip.art"},
-  {name = "Dr.Lt.Data", email = "dr.lt.data@gmail.com"}
-]
-
-dependencies = [
-    "typer>=0.9.0",
-    "GitPython",
-    "rich",
-    "requests",
-    "charset-normalizer>=3.0.0",
-    "pyyaml",
-    "typing-extensions>=4.7.0",
-    "mixpanel",
-    "questionary",
-    "psutil",
-    "tomlkit",
-    "pathspec",
-    "httpx",
-    "packaging",
-    "websocket-client"
+  {name = "Dr.Lt.Data", email = "dr.lt.data@gmail.com"},
 ]
 
 classifiers = [
   "Development Status :: 4 - Beta",
   "Intended Audience :: Developers",
-  "License :: OSI Approved :: GNU General Public License v3 (GPLv3)"
+  "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
+]
+
+dependencies = [
+  "charset-normalizer>=3.0.0",
+  "GitPython",
+  "httpx",
+  "mixpanel",
+  "packaging",
+  "pathspec",
+  "psutil",
+  "pyyaml",
+  "questionary",
+  "requests",
+  "rich",
+  "tomlkit",
+  "typer>=0.9.0",
+  "typing-extensions>=4.7.0",
+  "websocket-client",
+]
+
+[project.optional-dependencies]
+dev = [
+  "pre-commit",
+  "pytest",
+  "ruff",
 ]
 
 [project.scripts]
@@ -54,6 +61,15 @@ Repository = "https://github.com/drip-art/comfy-cli.git"
 where = ["."]
 include = ["comfy_cli*"]
 
-[tool.isort]
-profile = "black"
-line_length = 88
+[tool.ruff]
+line-length = 120
+target-version = "py39"
+
+[tool.ruff.lint]
+select = [
+  "E4", # default
+  "E7", # default
+  "E9", # default
+  "F", # default
+  "I", # isort-like behavior (import statement sorting)
+]
diff --git a/requirements.txt b/requirements.txt
diff --git a/tests/requirements.txt b/tests/requirements.txt