From fad8ffb41bc5391c7273cd678aad94f52e9b5173 Mon Sep 17 00:00:00 2001
From: Anthony Sottile <asottile@umich.edu>
Date: Mon, 31 Jul 2023 19:20:08 -0400
Subject: [PATCH] run flake8 in 3.12 now that 6.1 has been released (#782)

---
 .github/workflows/test.yml | 12 +-----------
 tox.ini                    |  5 ++---
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f68e7059..eacd67c6 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "pypy-3.9"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12-dev", "pypy-3.9"]
         os: [ubuntu-latest]
         # Include minimum py3 + maximum py3 + pypy3 on Windows
         include:
@@ -33,13 +33,3 @@ jobs:
 
       - name: Tox tests
         run: tox -e py
-  # TODO: after flake8 6.1 include this in the main matrix
-  py312:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v4
-      with:
-        python-version: '3.12-dev'
-    - run: pip install --upgrade tox
-    - run: tox -e py312
diff --git a/tox.ini b/tox.ini
index 69e9aa22..7a2a7712 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,13 +3,12 @@ skip_missing_interpreters = True
 envlist = py,pypy3
 
 [testenv]
-deps = flake8==6.0.0
+deps = flake8==6.1.0
 setenv = PYFLAKES_ERROR_UNKNOWN=1
 commands =
     python --version --version
     python -m unittest discover pyflakes {posargs}
-    # TODO: remove factor selection after flake8 6.1
-    !py312: flake8 pyflakes setup.py
+    flake8 pyflakes setup.py
 
 [flake8]
 builtins = unicode