From 36f4fc9e77fe3765b3a31fa5a76666578221ee97 Mon Sep 17 00:00:00 2001
From: richardsheridan <richard.sheridan@gmail.com>
Date: Sun, 5 Mar 2023 10:54:31 -0500
Subject: [PATCH] Go all in dependabot and only manually run pip-tools

---
 .github/dependabot.yml   |  6 +++++-
 .github/workflows/ci.yml | 18 +++++++++++++++---
 check.sh                 |  9 ---------
 test-requirements.in     |  1 -
 4 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 0c2930b120..e7560f348e 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -3,7 +3,7 @@ updates:
 - package-ecosystem: pip
   directory: "/"
   schedule:
-    interval: daily
+    interval: "weekly"
   open-pull-requests-limit: 10
   allow:
   - dependency-type: direct
@@ -34,3 +34,7 @@ updates:
   - dependency-name: pytest
     versions:
     - 6.2.2
+- package-ecosystem: github-actions
+  directory: "/"
+  schedule:
+    interval: "weekly"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 145ee55b11..a4b3971334 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -129,8 +129,6 @@ jobs:
     # https://docs.github.com/en/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions#changing-github_token-permissions
     permissions:
       pull-requests: write
-      issues: write
-      repository-projects: write
       contents: write
     steps:
       - name: Checkout
@@ -144,7 +142,7 @@ jobs:
       - name: Check formatting
         run: |
           python -m pip install -r test-requirements.txt
-          ./check.sh
+          black --check setup.py trio
       - name: Commit autoformatter changes
         if: failure()
         run: |
@@ -199,3 +197,17 @@ jobs:
         uses: re-actors/alls-green@release/v1
         with:
           jobs: ${{ toJSON(needs) }}
+
+
+  merge-dependabot:
+    needs: check
+    if: github.event_name == 'pull_request'
+    timeout-minutes: 1
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+      contents: write
+    steps:
+      - uses: fastify/github-action-merge-dependabot@v3
+        with:
+          merge-method: squash
\ No newline at end of file
diff --git a/check.sh b/check.sh
index 8416a9c5d1..57f1e2db40 100755
--- a/check.sh
+++ b/check.sh
@@ -28,15 +28,6 @@ mypy -m trio -m trio.testing --platform linux || EXIT_STATUS=$?
 mypy -m trio -m trio.testing --platform darwin || EXIT_STATUS=$?  # tests FreeBSD too
 mypy -m trio -m trio.testing --platform win32 || EXIT_STATUS=$?
 
-# Check pip compile is consistent
-pip-compile test-requirements.in
-pip-compile docs-requirements.in
-
-if git status --porcelain | grep -q "requirements.txt"; then
-    git status --porcelain
-    EXIT_STATUS=1
-fi
-
 # Finally, leave a really clear warning of any issues and exit
 if [ $EXIT_STATUS -ne 0 ]; then
     cat <<EOF
diff --git a/test-requirements.in b/test-requirements.in
index eda15ef4b3..85ca664925 100644
--- a/test-requirements.in
+++ b/test-requirements.in
@@ -16,7 +16,6 @@ mypy; implementation_name == "cpython"
 types-pyOpenSSL; implementation_name == "cpython"
 flake8
 astor          # code generation
-pip-tools
 
 # https://github.com/python-trio/trio/pull/654#issuecomment-420518745
 # typed_ast is deprecated as of 3.8, and straight up doesn't compile on 3.10-dev as of 2021-12-13