From 48bf890b52ac82d9539e6045f4a5268785866229 Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Tue, 18 Jul 2023 10:18:04 +0200
Subject: [PATCH] ci: remove Python 3.7 support and Python 3.11

---
 .github/workflows/ci.yaml |  8 ++++----
 .mergify.yml              | 23 +++++++++++++----------
 pyproject.toml            |  2 +-
 setup.cfg                 |  2 +-
 tox.ini                   |  4 ++--
 5 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 4d0a566..b685da9 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -10,9 +10,9 @@ jobs:
   test:
     strategy:
       matrix:
-        python: ["3.7", "3.8", "3.9", "3.10"]
+        python: ["3.8", "3.9", "3.10", "3.11"]
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout 🛎️
         uses: actions/checkout@v2.4.0
@@ -29,7 +29,7 @@ jobs:
         run: tox -e py$(echo ${{ matrix.python }} | tr -d .)
 
   pep8:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout 🛎️
         uses: actions/checkout@v2.4.0
@@ -37,7 +37,7 @@ jobs:
       - name: Setup Python 🔧
         uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
+          python-version: "3.11"
 
       - name: Install tox
         run: pip install tox
diff --git a/.mergify.yml b/.mergify.yml
index 94da175..8accd90 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -2,17 +2,8 @@ pull_request_rules:
   - name: automatic merge
     conditions:
       - base=main
-      - "#approved-reviews-by>=1"
-      - and: &CheckRuns
-          - "check-success=pep8"
-          - "check-success=test (3.7)"
-          - "check-success=test (3.8)"
-          - "check-success=test (3.9)"
-          - "check-success=test (3.10)"
-
     actions:
       queue:
-        name: default
 
   - name: dismiss reviews
     conditions: []
@@ -22,4 +13,16 @@ pull_request_rules:
 
 queue_rules:
   - name: default
-    conditions: []
+    queue_conditions:
+      - "#approved-reviews-by>=1"
+      - "check-success=pep8"
+      - "check-success=test (3.8)"
+      - "check-success=test (3.9)"
+      - "check-success=test (3.10)"
+      - "check-success=test (3.11)"
+    merge_conditions:
+      - "check-success=pep8"
+      - "check-success=test (3.8)"
+      - "check-success=test (3.9)"
+      - "check-success=test (3.10)"
+      - "check-success=test (3.11)"
diff --git a/pyproject.toml b/pyproject.toml
index a362659..c5cce42 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,5 +1,5 @@
 [tool.black]
-target-version = ['py37', 'py38', 'py39', 'py310']
+target-version = ['py38', 'py39', 'py310', 'py311']
 
 [tool.mypy]
 files = "daiquiri"
diff --git a/setup.cfg b/setup.cfg
index 0095135..bad2ffa 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -14,10 +14,10 @@ classifier =
     Operating System :: POSIX :: Linux
     Programming Language :: Python
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
 
 [options]
 install_requires =
diff --git a/tox.ini b/tox.ini
index e991e0f..c83a789 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,8 @@
 [tox]
-envlist = py37,py38,py39,p310,pep8,docs
+envlist = py38,py39,py310,py311,pep8,docs
 
 [testenv]
-whitelist_externals = sh
+allowlist_externals = sh
 deps = -e.[test]
 commands =
   pytest {posargs}