From c0089ef19dd12f872c581f106b1236c46d609955 Mon Sep 17 00:00:00 2001
From: Cooper Lees <cooper@fb.com>
Date: Sat, 17 Dec 2022 09:19:45 -0800
Subject: [PATCH] Remove separate 3.11 CI now deps support 3.11 (#3446)

* Remove separate 3.11 CI now deps support 3.11

- We can run everything now like all other stable versions of Python
- test in a 3.11 vent: `/tmp/tb/bin/tox -e py311,ci-py311`

```
  py311: OK (28.99=setup[7.90]+cmd[5.29,0.66,6.94,6.08,1.89,0.24] seconds)
  ci-py311: OK (30.33=setup[3.20]+cmd[3.66,0.31,17.43,4.60,0.90,0.23] seconds)
  congratulations :) (59.35 seconds)
```

* Add to CHANGES.md

* Add fuzz run in 3.11
---
 .github/workflows/fuzz.yml     |  2 +-
 .github/workflows/test-311.yml | 57 ----------------------------------
 .github/workflows/test.yml     |  2 +-
 CHANGES.md                     |  2 ++
 4 files changed, 4 insertions(+), 59 deletions(-)
 delete mode 100644 .github/workflows/test-311.yml

diff --git a/.github/workflows/fuzz.yml b/.github/workflows/fuzz.yml
index ebb8a9fda9e..373e1500ee9 100644
--- a/.github/workflows/fuzz.yml
+++ b/.github/workflows/fuzz.yml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
 
     steps:
       - uses: actions/checkout@v3
diff --git a/.github/workflows/test-311.yml b/.github/workflows/test-311.yml
deleted file mode 100644
index c2da2465ad5..00000000000
--- a/.github/workflows/test-311.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-name: Test 3.11 without aiohttp extensions
-
-on:
-  push:
-    paths-ignore:
-      - "docs/**"
-      - "*.md"
-
-  pull_request:
-    paths-ignore:
-      - "docs/**"
-      - "*.md"
-
-permissions:
-  contents: read
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
-  cancel-in-progress: true
-
-jobs:
-  main:
-    # We want to run on external PRs, but not on our own internal PRs as they'll be run
-    # by the push to the branch. Without this if check, checks are duplicated since
-    # internal PRs match both the push and pull_request events.
-    if:
-      github.event_name == 'push' || github.event.pull_request.head.repo.full_name !=
-      github.repository
-
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: ["3.11.0-rc - 3.11"]
-        os: [ubuntu-latest, macOS-latest, windows-latest]
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Install tox
-        run: |
-          python -m pip install --upgrade pip
-          python -m pip install --upgrade tox
-
-      - name: Run tests via tox
-        run: |
-          python -m tox -e 311
-
-      - name: Format ourselves
-        run: |
-          python -m pip install .
-          python -m black --check src/
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 372d1fd5d38..3ca2a469147 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -31,7 +31,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "pypy-3.7", "pypy-3.8"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "pypy-3.7", "pypy-3.8"]
         os: [ubuntu-latest, macOS-latest, windows-latest]
 
     steps:
diff --git a/CHANGES.md b/CHANGES.md
index e1ad5e1f1cc..ba71ee6c99d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -57,6 +57,8 @@
 
 <!-- For example, Docker, GitHub Actions, pre-commit, editors -->
 
+- Move 3.11 CI to normal flow now all dependencies support 3.11 (#3446)
+
 ### Documentation
 
 <!-- Major changes to documentation and policies. Small docs changes