From b39240b6e13aeab01ef43cb1cb1aeb9d8a7b6b41 Mon Sep 17 00:00:00 2001
From: Alex Waygood <Alex.Waygood@Gmail.com>
Date: Wed, 5 Oct 2022 23:22:27 -0700
Subject: [PATCH] No longer emit a `FutureWarning` when run with flake8<5; add
 a CI job to run with flake8<5 (#293)

---
 .github/workflows/check.yml | 15 +++++++++++++++
 CHANGELOG.md                |  8 ++++++++
 pyi.py                      | 13 -------------
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 14a8eab9..1fb81c73 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -57,6 +57,21 @@ jobs:
     - run: pip install -e .
     - run: pip install -r requirements-dev.txt
     - run: python3 -m pytest -vv
+  tests-flake8-v4:
+    name: pytest suite with flake8 v4
+    timeout-minutes: 10
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-python@v2
+      with:
+        # Run on Python 3.7, as the importlib_metadata compatibility problems with flake8 v5
+        # are much less on Python 3.8+, where importlib.metadata is available in the stdlib
+        python-version: 3.7
+    - run: pip install "flake8<5"
+    - run: pip install -e .
+    - run: pip install -r requirements-dev.txt
+    - run: python3 -m pytest -vv
   check-typeshed:
     name: typeshed_primer
     timeout-minutes: 5
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 578ac7d4..294a0de1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,14 @@ Bugfixes:
   `__all__` definitions.
 * Expand Y015 so that errors are emitted for assignments to negative numbers.
 
+Other changes:
+* Since v22.8.1, flake8-pyi has emitted a `FutureWarning` if run with flake8<5,
+  warning that the plugin would soon become incompatible with flake8<5. Due to
+  some issues that mean that some users are unable to upgrade to flake8>=5,
+  however, flake8-pyi no longer intends to remove support for running the
+  plugin with flake8<5 before Python 3.7 has reached end-of-life. As such, the
+  `FutureWarning` is no longer emitted.
+
 ## 22.8.2
 
 New error codes:
diff --git a/pyi.py b/pyi.py
index 2e32e339..5b9087cf 100644
--- a/pyi.py
+++ b/pyi.py
@@ -44,19 +44,6 @@ def unparse(node: ast.AST) -> str:
 LOG = logging.getLogger("flake8.pyi")
 FLAKE8_MAJOR_VERSION = flake8.__version_info__[0]
 
-if FLAKE8_MAJOR_VERSION < 5:
-    import warnings
-
-    warnings.warn(
-        (
-            "flake8-pyi will drop support for running with flake8 < 5.0.0 "
-            "in a future version. This will not happen until November 2022 "
-            "at the earliest."
-        ),
-        category=FutureWarning,
-    )
-
-
 if sys.version_info >= (3, 9):
     _LiteralMember: TypeAlias = ast.expr
 else: