From 7d9c83edeb7746d6522f89f8c1a02c0935bc15b8 Mon Sep 17 00:00:00 2001
From: EXPLOSION <git@helvetica.moe>
Date: Wed, 8 Feb 2023 03:34:33 +0000
Subject: [PATCH 1/2] Run pip-compile in formatting check

Additionally, commit autoformatter changes for Dependabot
---
 .github/workflows/ci.yml |  8 ++++++++
 check.sh                 |  8 ++++++++
 docs-requirements.txt    |  6 ++++--
 test-requirements.in     |  1 +
 test-requirements.txt    | 36 ++++++++++++++++++++++++++++++++----
 5 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 92bc20539d..047083876f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -120,6 +120,14 @@ jobs:
           CHECK_FORMATTING: '${{ matrix.check_formatting }}'
           # Should match 'name:' up above
           JOB_NAME: 'Ubuntu (${{ matrix.python }}${{ matrix.extra_name }})'
+      - name: Commit autoformatter changes
+        continue-on-error: true
+        if: failure() && matrix.check_formatting == '1' && github.actor == 'dependabot[bot]'
+        run: |
+          git config user.name github-actions
+          git config user.email github-actions@github.com
+          git commit -am "Autoformatter changes"
+          git push
 
   macOS:
     name: 'macOS (${{ matrix.python }})'
diff --git a/check.sh b/check.sh
index 57f1e2db40..fbd440521c 100755
--- a/check.sh
+++ b/check.sh
@@ -28,6 +28,14 @@ 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
+    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/docs-requirements.txt b/docs-requirements.txt
index 354f26fd38..537e0f908b 100644
--- a/docs-requirements.txt
+++ b/docs-requirements.txt
@@ -1,6 +1,6 @@
 #
-# This file is autogenerated by pip-compile with python 3.7
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.8
+# by the following command:
 #
 #    pip-compile docs-requirements.in
 #
@@ -84,6 +84,8 @@ sphinxcontrib-serializinghtml==1.1.5
     # via sphinx
 sphinxcontrib-trio==1.1.2
     # via -r docs-requirements.in
+tomli==2.0.1
+    # via towncrier
 towncrier==22.12.0
     # via -r docs-requirements.in
 urllib3==1.26.14
diff --git a/test-requirements.in b/test-requirements.in
index 85ca664925..eda15ef4b3 100644
--- a/test-requirements.in
+++ b/test-requirements.in
@@ -16,6 +16,7 @@ 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
diff --git a/test-requirements.txt b/test-requirements.txt
index 60981ad92c..f0b9db7bbb 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,6 +1,6 @@
 #
-# This file is autogenerated by pip-compile with python 3.7
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.8
+# by the following command:
 #
 #    pip-compile test-requirements.in
 #
@@ -19,10 +19,14 @@ backcall==0.2.0
     # via ipython
 black==22.12.0 ; implementation_name == "cpython"
     # via -r test-requirements.in
+build==0.10.0
+    # via pip-tools
 cffi==1.15.1
     # via cryptography
 click==8.1.3
-    # via black
+    # via
+    #   black
+    #   pip-tools
 coverage[toml]==6.4.1
     # via pytest-cov
 cryptography==39.0.1
@@ -35,6 +39,10 @@ decorator==5.1.1
     # via ipython
 dill==0.3.6
     # via pylint
+exceptiongroup==1.1.0 ; python_version < "3.11"
+    # via
+    #   -r test-requirements.in
+    #   pytest
 flake8==4.0.1
     # via -r test-requirements.in
 idna==3.4
@@ -69,7 +77,9 @@ mypy-extensions==0.4.3 ; implementation_name == "cpython"
 outcome==1.2.0
     # via -r test-requirements.in
 packaging==23.0
-    # via pytest
+    # via
+    #   build
+    #   pytest
 parso==0.8.3
     # via jedi
 pathspec==0.10.3
@@ -78,6 +88,8 @@ pexpect==4.8.0
     # via ipython
 pickleshare==0.7.5
     # via ipython
+pip-tools==6.12.2
+    # via -r test-requirements.in
 platformdirs==3.0.0
     # via
     #   black
@@ -100,6 +112,8 @@ pylint==2.16.0
     # via -r test-requirements.in
 pyopenssl==23.0.0
     # via -r test-requirements.in
+pyproject-hooks==1.0.0
+    # via build
 pytest==7.2.1
     # via
     #   -r test-requirements.in
@@ -110,6 +124,14 @@ sniffio==1.3.0
     # via -r test-requirements.in
 sortedcontainers==2.4.0
     # via -r test-requirements.in
+tomli==2.0.1
+    # via
+    #   black
+    #   build
+    #   coverage
+    #   mypy
+    #   pylint
+    #   pytest
 tomlkit==0.11.6
     # via pylint
 traitlets==5.8.1
@@ -123,11 +145,17 @@ types-pyopenssl==23.0.0.2 ; implementation_name == "cpython"
 typing-extensions==4.4.0 ; implementation_name == "cpython"
     # via
     #   -r test-requirements.in
+    #   astroid
+    #   black
     #   mypy
+    #   pylint
 wcwidth==0.2.6
     # via prompt-toolkit
+wheel==0.38.4
+    # via pip-tools
 wrapt==1.14.1
     # via astroid
 
 # The following packages are considered to be unsafe in a requirements file:
+# pip
 # setuptools

From 363f266d30e82f5acf9b233ffdbb5183b2158420 Mon Sep 17 00:00:00 2001
From: EXPLOSION <git@helvetica.moe>
Date: Fri, 10 Feb 2023 14:34:19 +0000
Subject: [PATCH 2/2] Use the correct user for GitHub Actions

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 047083876f..1584e356f2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -124,8 +124,8 @@ jobs:
         continue-on-error: true
         if: failure() && matrix.check_formatting == '1' && github.actor == 'dependabot[bot]'
         run: |
-          git config user.name github-actions
-          git config user.email github-actions@github.com
+          git config user.name 'github-actions[bot]'
+          git config user.email '41898282+github-actions[bot]@users.noreply.github.com'
           git commit -am "Autoformatter changes"
           git push