From caae74d92e0cad08b03e96262369a4c6ada5af16 Mon Sep 17 00:00:00 2001
From: Eitan Turok <eitan.turok@databricks.com>
Date: Thu, 1 Aug 2024 03:58:12 +0000
Subject: [PATCH] remove pydocstyle

---
 .pre-commit-config.yaml | 11 -----------
 pyproject.toml          | 39 +++++++++++++++++++++++++++------------
 2 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index dc2e3f55cd..b45021dd8c 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -77,17 +77,6 @@ repos:
   hooks:
   - id: docformatter
     args: [--in-place, --wrap-summaries=80, --wrap-descriptions=80]
-- repo: https://github.com/PyCQA/pydocstyle
-  hooks:
-  - id: pydocstyle
-    name: pydocstyle
-    entry: pydocstyle
-    language: python
-    types: [python]
-    exclude: (.ci|.github)
-    additional_dependencies:
-    - toml
-  rev: 6.1.1
 - repo: https://github.com/adrienverge/yamllint.git
   rev: v1.28.0
   hooks:
diff --git a/pyproject.toml b/pyproject.toml
index e5c931f4c5..76953833ac 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -11,23 +11,43 @@ skip = [ "env", "wandb", "runs", "build", "node_modules" ]
 include_trailing_comma = true
 split_on_trailing_comma = true
 
+# Ruff global
+[tool.ruff]
+exclude = [
+    "build/**",
+    "docs/**",
+    "node_modules/**",
+]
+
+# Ruff linter
 [tool.ruff.lint]
 select = [
     "C4",
-    # TODO port pydocstyle
-    # "D", # pydocstyle
     "LOG",
     "PERF",
     "PLE",
     "COM812",
 ]
-[tool.ruff]
-exclude = [
-    "build/**",
-    "docs/**",
-    "node_modules/**",
+
+extend-select = ["D404"] # pydocstyle
+
+ignore = [
+    "D100",
+    "D101",
+    "D102",
+    "D103",
+    "D104",
+    "D105",
+    "D107",
+    "D400",
+    "D401",
+    "D415",
 ]
 
+[tool.ruff.lint.pydocstyle]
+convention = "google"
+
+
 # Coverage
 [tool.coverage.run]
 parallel = true
@@ -506,8 +526,3 @@ ignore_patterns = [
     "wandb/**/*.py",
     "build/**/*.py",
 ]
-
-[tool.pydocstyle]
-convention="google"
-add_ignore="D100,D101,D102,D103,D104,D105,D107,D400,D401,D415"
-add_select="D404"