From 852f4c8ff95555a656f4508e1193e1bf24e59946 Mon Sep 17 00:00:00 2001
From: Mergify <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 11 Dec 2024 11:51:49 +0000
Subject: [PATCH] ci(mergify): upgrade configuration to current format

---
 .mergify.yml | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index bae7a5b..91059f2 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,8 +1,11 @@
 queue_rules:
   - name: default
-    conditions:
+    queue_conditions:
+      - "-merged"
       - "#approved-reviews-by>=1"
       - "#changes-requested-reviews-by=0"
+      - base=main
+      - label=AUTOMERGE-REQUESTED
       - status-success=Lint
       - status-success=Python (3.9, macos-latest)
       - status-success=Python (3.12, macos-latest)
@@ -11,15 +14,9 @@ queue_rules:
       - status-success=Python (3.9, windows-latest)
       - status-success=Python (3.12, windows-latest)
       - "status-success=ci/circleci: build"
-
-pull_request_rules:
-  - name: Automatic rebase, CI and merge
-    conditions:
-      - "-merged"
+    merge_conditions:
       - "#approved-reviews-by>=1"
       - "#changes-requested-reviews-by=0"
-      - base=main
-      - label=AUTOMERGE-REQUESTED
       - status-success=Lint
       - status-success=Python (3.9, macos-latest)
       - status-success=Python (3.12, macos-latest)
@@ -28,12 +25,10 @@ pull_request_rules:
       - status-success=Python (3.9, windows-latest)
       - status-success=Python (3.12, windows-latest)
       - "status-success=ci/circleci: build"
-    actions:
-      queue:
-        name: default
-        method: rebase
-        update_method: rebase
+    update_method: rebase
+    merge_method: rebase
 
+pull_request_rules:
   - name: Remove label after merge
     conditions:
       - merged
@@ -41,4 +36,8 @@ pull_request_rules:
     actions:
       label:
         remove:
-          - AUTOMERGE-REQUESTED
\ No newline at end of file
+          - AUTOMERGE-REQUESTED
+  - name: Automatic rebase, CI and merge
+    conditions: []
+    actions:
+      queue: