From 210f153537a0362c12345e57a349fedc998cf16b Mon Sep 17 00:00:00 2001
From: Tania Allard <taniar.allard@gmail.com>
Date: Mon, 25 Oct 2021 12:47:32 +0100
Subject: [PATCH 1/2] ENH: Use yaml anchors for pre-commit hooks additional
 dependencies

---
 .pre-commit-config.yaml         | 15 ++++++---------
 scripts/sync_flake8_versions.py | 27 +--------------------------
 2 files changed, 7 insertions(+), 35 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 2c76b682ee343..469c4066e2387 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -39,10 +39,11 @@ repos:
     rev: 3.9.2
     hooks:
     -   id: flake8
-        additional_dependencies:
-            - flake8-comprehensions==3.1.0
-            - flake8-bugbear==21.3.2
-            - pandas-dev-flaker==0.2.0
+        additional_dependencies: &flake8_dependencies
+        - flake8==3.9.2
+        - flake8-comprehensions==3.1.0
+        - flake8-bugbear==21.3.2
+        - pandas-dev-flaker==0.2.0
     -   id: flake8
         alias: flake8-cython
         name: flake8 (cython)
@@ -76,11 +77,7 @@ repos:
     rev: v1.2.3
     hooks:
     -   id: yesqa
-        additional_dependencies:
-            - flake8==3.9.2
-            - flake8-comprehensions==3.1.0
-            - flake8-bugbear==21.3.2
-            - pandas-dev-flaker==0.2.0
+        additional_dependencies: *flake8_dependencies
 -   repo: local
     hooks:
     -   id: pyright
diff --git a/scripts/sync_flake8_versions.py b/scripts/sync_flake8_versions.py
index cb6bb1eb0986e..cec0b96f3c38d 100644
--- a/scripts/sync_flake8_versions.py
+++ b/scripts/sync_flake8_versions.py
@@ -68,16 +68,9 @@ def _conda_to_pip_compat(dep):
 
 def _validate_additional_dependencies(
     flake8_additional_dependencies,
-    yesqa_additional_dependencies,
     environment_additional_dependencies,
 ) -> None:
     for dep in flake8_additional_dependencies:
-        if dep not in yesqa_additional_dependencies:
-            sys.stdout.write(
-                f"Mismatch of '{dep.name}' version between 'flake8' "
-                "and 'yesqa' in '.pre-commit-config.yaml'\n"
-            )
-            sys.exit(1)
         if dep not in environment_additional_dependencies:
             sys.stdout.write(
                 f"Mismatch of '{dep.name}' version between 'enviroment.yml' "
@@ -94,13 +87,6 @@ def _validate_revisions(revisions):
         )
         sys.exit(1)
 
-    if revisions.yesqa != revisions.pre_commit:
-        sys.stdout.write(
-            f"{revisions.name} in 'yesqa' does not match "
-            "in 'flake8' from 'pre-commit'\n"
-        )
-        sys.exit(1)
-
 
 def _process_dependencies(deps):
     for dep in deps:
@@ -127,19 +113,9 @@ def get_revisions(
     for dep in _process_dependencies(flake8_hook.get("additional_dependencies", [])):
         if dep.name == "pandas-dev-flaker":
             pandas_dev_flaker_revisions.pre_commit = dep
-        else:
+        elif dep.name != "flake8":
             flake8_additional_dependencies.append(dep)
 
-    _, yesqa_hook = _get_repo_hook(repos, "yesqa")
-    yesqa_additional_dependencies = []
-    for dep in _process_dependencies(yesqa_hook.get("additional_dependencies", [])):
-        if dep.name == "flake8":
-            flake8_revisions.yesqa = dep
-        elif dep.name == "pandas-dev-flaker":
-            pandas_dev_flaker_revisions.yesqa = dep
-        else:
-            yesqa_additional_dependencies.append(dep)
-
     environment_dependencies = environment["dependencies"]
     environment_additional_dependencies = []
     for dep in _process_dependencies(environment_dependencies):
@@ -152,7 +128,6 @@ def get_revisions(
 
     _validate_additional_dependencies(
         flake8_additional_dependencies,
-        yesqa_additional_dependencies,
         environment_additional_dependencies,
     )
 

From e9ff2a5f9c74e52280e6dfdca18f7c1e935fb028 Mon Sep 17 00:00:00 2001
From: Tania Allard <taniar.allard@gmail.com>
Date: Mon, 25 Oct 2021 14:03:29 +0100
Subject: [PATCH 2/2] ENH: add flake8 to env additonal deps

---
 scripts/sync_flake8_versions.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/sync_flake8_versions.py b/scripts/sync_flake8_versions.py
index cec0b96f3c38d..370924cdfa199 100644
--- a/scripts/sync_flake8_versions.py
+++ b/scripts/sync_flake8_versions.py
@@ -113,7 +113,7 @@ def get_revisions(
     for dep in _process_dependencies(flake8_hook.get("additional_dependencies", [])):
         if dep.name == "pandas-dev-flaker":
             pandas_dev_flaker_revisions.pre_commit = dep
-        elif dep.name != "flake8":
+        else:
             flake8_additional_dependencies.append(dep)
 
     environment_dependencies = environment["dependencies"]
@@ -121,6 +121,7 @@ def get_revisions(
     for dep in _process_dependencies(environment_dependencies):
         if dep.name == "flake8":
             flake8_revisions.environment = dep
+            environment_additional_dependencies.append(dep)
         elif dep.name == "pandas-dev-flaker":
             pandas_dev_flaker_revisions.environment = dep
         else: