From a211f635def378353b246d514d5d92c95c19a8cc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 11 Feb 2023 02:19:23 +0000 Subject: [PATCH 1/5] Bump black from 22.12.0 to 23.1.0 Bumps [black](https://github.com/psf/black) from 22.12.0 to 23.1.0. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](https://github.com/psf/black/compare/22.12.0...23.1.0) --- updated-dependencies: - dependency-name: black dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- test-requirements.txt | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index e6d832f9d0..1d45dd93ec 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -17,7 +17,7 @@ attrs==22.2.0 # pytest backcall==0.2.0 # via ipython -black==22.12.0 ; implementation_name == "cpython" +black==23.1.0 ; implementation_name == "cpython" # via -r test-requirements.in build==0.10.0 # via pip-tools @@ -39,10 +39,6 @@ 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 @@ -78,6 +74,7 @@ outcome==1.2.0 # via -r test-requirements.in packaging==23.0 # via + # black # build # pytest parso==0.8.3 @@ -124,14 +121,6 @@ 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 @@ -145,10 +134,7 @@ 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 From b196eb6e6c92fa7cffca14f607c552e5129b9da3 Mon Sep 17 00:00:00 2001 From: EXPLOSION Date: Sat, 11 Feb 2023 02:24:31 +0000 Subject: [PATCH 2/5] Try to fix committing one more time --- .github/workflows/ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d9facabbe1..3c5a8645c8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -101,6 +101,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 + with: + ref: ${{ github.event.pull_request.head.ref }} - name: Setup python uses: actions/setup-python@v2 if: "!endsWith(matrix.python, '-dev')" @@ -122,12 +124,12 @@ jobs: 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]' + if: failure() && matrix.check_formatting == '1' #&& github.actor == 'dependabot[bot]' run: | 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 origin "HEAD:${GITHUB_HEAD_REF}" + git push macOS: name: 'macOS (${{ matrix.python }})' From 93205f1957d35d8660907c3999192165f8340500 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 11 Feb 2023 02:47:54 +0000 Subject: [PATCH 3/5] Autoformatter changes --- docs-requirements.txt | 2 ++ test-requirements.txt | 15 +++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/docs-requirements.txt b/docs-requirements.txt index 46c19380e3..ae4527f7c7 100644 --- a/docs-requirements.txt +++ b/docs-requirements.txt @@ -86,6 +86,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.txt b/test-requirements.txt index 1d45dd93ec..8676cb210a 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -39,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 @@ -121,6 +125,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 @@ -134,7 +146,10 @@ 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 From bfe6e9b47cc19f392b508d4cdcc082dbb2c0ea64 Mon Sep 17 00:00:00 2001 From: EXPLOSION Date: Sat, 11 Feb 2023 02:50:10 +0000 Subject: [PATCH 4/5] Remove the testing configuration for autoformatting --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3c5a8645c8..fcc10c8104 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -124,7 +124,7 @@ jobs: 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]' + if: failure() && matrix.check_formatting == '1' && github.actor == 'dependabot[bot]' run: | git config user.name 'github-actions[bot]' git config user.email '41898282+github-actions[bot]@users.noreply.github.com' From 0381fef5a40d5206c018f9fd3f99e8770e798855 Mon Sep 17 00:00:00 2001 From: EXPLOSION Date: Sat, 11 Feb 2023 02:54:53 +0000 Subject: [PATCH 5/5] Make sure to actually commit black's changes --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fcc10c8104..87c6fb93d8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -126,6 +126,7 @@ jobs: continue-on-error: true if: failure() && matrix.check_formatting == '1' && github.actor == 'dependabot[bot]' run: | + black setup.py trio git config user.name 'github-actions[bot]' git config user.email '41898282+github-actions[bot]@users.noreply.github.com' git commit -am "Autoformatter changes"