From 63c7fb0914c81fb7abfdd2eb98addd268122b655 Mon Sep 17 00:00:00 2001
From: Avasam <samuel.06@hotmail.com>
Date: Thu, 12 Jan 2023 04:57:18 -0500
Subject: [PATCH] Use environment marker to restrict flake8 install (#9510)

---
 .github/workflows/daily.yml |  2 +-
 .github/workflows/tests.yml |  2 +-
 requirements-tests.txt      | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml
index 6e1e61139..850c70f27 100644
--- a/.github/workflows/daily.yml
+++ b/.github/workflows/daily.yml
@@ -43,7 +43,7 @@ jobs:
           cache: pip
           cache-dependency-path: requirements-tests.txt
       - name: Install dependencies
-        run: pip install $(grep tomli== requirements-tests.txt) $(grep mypy== requirements-tests.txt)
+        run: pip install $(grep mypy== requirements-tests.txt)
       - name: Run stubtest
         run: python tests/stubtest_stdlib.py
 
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 01ffd72c2..51f3391f3 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -94,7 +94,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
           cache: pip
           cache-dependency-path: requirements-tests.txt
-      - run: pip install $(grep mypy== requirements-tests.txt) packaging pathspec termcolor tomli typing-extensions
+      - run: pip install -r requirements-tests.txt
       - run: python ./tests/mypy_test.py --platform=${{ matrix.platform }} --python-version=${{ matrix.python-version }}
 
   regression-tests:
diff --git a/requirements-tests.txt b/requirements-tests.txt
index 3675b6b08..40073ac09 100644
--- a/requirements-tests.txt
+++ b/requirements-tests.txt
@@ -1,14 +1,14 @@
 aiohttp==3.8.3
-black==22.12.0            # must match .pre-commit-config.yaml
-flake8==6.0.0             # must match .pre-commit-config.yaml
-flake8-bugbear==22.12.6   # must match .pre-commit-config.yaml
-flake8-noqa==1.3.0        # must match .pre-commit-config.yaml
-flake8-pyi==22.11.0       # must match .pre-commit-config.yaml
-isort==5.11.4             # must match .pre-commit-config.yaml
+black==22.12.0                                    # must match .pre-commit-config.yaml
+flake8==6.0.0; python_version >= "3.8"            # must match .pre-commit-config.yaml
+flake8-bugbear==22.12.6; python_version >= "3.8"  # must match .pre-commit-config.yaml
+flake8-noqa==1.3.0; python_version >= "3.8"       # must match .pre-commit-config.yaml
+flake8-pyi==22.11.0; python_version >= "3.8"      # must match .pre-commit-config.yaml
+isort==5.11.4                                     # must match .pre-commit-config.yaml
 mypy==0.991
 packaging==22.0
 pathspec
-pycln==2.1.2              # must match .pre-commit-config.yaml
+pycln==2.1.2                                      # must match .pre-commit-config.yaml
 pyyaml==6.0
 pytype==2023.1.10; platform_system != "Windows" and python_version < "3.11"
 termcolor>=2