Merge pull request #633 from benjeffery/fix-dependabot2

Fix mergify, remove dependabot

Author: benjeffery

.github/dependabot.yml

@@ -1,8 +1,23 @@
+queue_rules:
+  - name: default
+    conditions:
+      - "#approved-reviews-by>=1"
+      - "#changes-requested-reviews-by=0"
+      - status-success=Lint
+      - status-success=Python (3.7, macos-latest)
+      - status-success=Python (3.9, macos-latest)
+      - status-success=Python (3.7, ubuntu-latest)
+      - status-success=Python (3.9, ubuntu-latest)
+      - status-success=Python (3.7, windows-latest)
+      - status-success=Python (3.9, windows-latest)
+      - "status-success=ci/circleci: build"
+
 pull_request_rules:
   - name: Automatic rebase, CI and merge
     conditions:
       - "-merged"
       - "#approved-reviews-by>=1"
+      - "#changes-requested-reviews-by=0"
       - base=main
       - label=AUTOMERGE-REQUESTED
       - status-success=Lint
@@ -14,10 +29,11 @@ pull_request_rules:
       - status-success=Python (3.9, windows-latest)
       - "status-success=ci/circleci: build"
     actions:
-      merge:
-        strict: smart
-        strict_method: rebase
-        method: merge
+      queue:
+        name: default
+        method: rebase
+        rebase_fallback: none
+        update_method: rebase
 
   - name: Remove label after merge
     conditions:
@@ -27,23 +43,3 @@ pull_request_rules:
       label:
         remove:
           - AUTOMERGE-REQUESTED
-
-
-  - name: Automatic dep update
-    conditions:
-      - author~=^dependabot(|-preview)\[bot\]$
-      - "-merged"
-      - base=main
-      - status-success=Lint
-      - status-success=Python (3.7, macos-latest)
-      - status-success=Python (3.9, macos-latest)
-      - status-success=Python (3.7, ubuntu-latest)
-      - status-success=Python (3.9, ubuntu-latest)
-      - status-success=Python (3.7, windows-latest)
-      - status-success=Python (3.9, windows-latest)
-      - "status-success=ci/circleci: build"
-    actions:
-      merge:
-        strict: smart
-        strict_method: rebase
-        method: merge