From d2a4c1929426f196431b700feb252b413a8534f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torsten=20W=C3=B6rtwein?= <twoertwein@gmail.com>
Date: Tue, 5 Jul 2022 14:06:10 -0400
Subject: [PATCH 1/2] CI: run flake8-pyi with all the other flake8 plugins

---
 .pre-commit-config.yaml | 11 +++--------
 setup.cfg               |  2 ++
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 8d1e13c1e2212..891fed73e15e9 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -49,10 +49,13 @@ repos:
     rev: 4.0.1
     hooks:
     -   id: flake8
+        types: [text]  # overwrite types: [python]
+        types_or: [python, pyi]
         additional_dependencies: &flake8_dependencies
         - flake8==4.0.1
         - flake8-comprehensions==3.7.0
         - flake8-bugbear==21.3.2
+        - flake8-pyi==22.5.1
         - pandas-dev-flaker==0.5.0
 -   repo: https://github.com/PyCQA/isort
     rev: 5.10.1
@@ -229,11 +232,3 @@ repos:
         entry: python scripts/validate_min_versions_in_sync.py
         language: python
         files: ^(ci/deps/actions-.*-minimum_versions\.yaml|pandas/compat/_optional\.py)$
-    -   id: flake8-pyi
-        name: flake8-pyi
-        entry: flake8 --extend-ignore=E301,E302,E305,E701,E704
-        types: [pyi]
-        language: python
-        additional_dependencies:
-        - flake8==4.0.1
-        - flake8-pyi==22.5.1
diff --git a/setup.cfg b/setup.cfg
index b191930acf4c5..5e431cc36d0c5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -139,6 +139,8 @@ per-file-ignores =
     pandas/testing.py:PDF014
     # can't use fixtures in asv
     asv_bench/*:PDF016
+    # black formats pyi files differently
+    *.pyi:E301,E302,E305,E701,E704
 
 
 [flake8-rst]

From 607508ba28094a98e82113377564f66f0c08b4b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torsten=20W=C3=B6rtwein?= <twoertwein@gmail.com>
Date: Tue, 5 Jul 2022 14:38:12 -0400
Subject: [PATCH 2/2] requirements-dev.txt and environment.yml

---
 environment.yml      | 1 +
 requirements-dev.txt | 1 +
 2 files changed, 2 insertions(+)

diff --git a/environment.yml b/environment.yml
index 0a6055d80c071..675c21f58a8be 100644
--- a/environment.yml
+++ b/environment.yml
@@ -87,6 +87,7 @@ dependencies:
   - flake8=4.0.1
   - flake8-bugbear=21.3.2  # used by flake8, find likely bugs
   - flake8-comprehensions=3.7.0  # used by flake8, linting of unnecessary comprehensions
+  - flake8-pyi=22.5.1  # used by flake8, best practises for type stubs
   - isort>=5.2.1  # check that imports are in the right order
   - mypy=0.960
   - pre-commit>=2.15.0
diff --git a/requirements-dev.txt b/requirements-dev.txt
index f5dfeb8e7ff30..ad5f17eef02a2 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -66,6 +66,7 @@ cpplint
 flake8==4.0.1
 flake8-bugbear==21.3.2
 flake8-comprehensions==3.7.0
+flake8-pyi==22.5.1
 isort>=5.2.1
 mypy==0.960
 pre-commit>=2.15.0