From 0631022f32c4f88a864ae8cbdf358f670303c8d8 Mon Sep 17 00:00:00 2001 From: Artyom Romanov Date: Wed, 25 Oct 2023 16:55:03 +0500 Subject: [PATCH 1/4] Move `mypy` pin from `Tools/clinic/requirements-dev.txt` to `Tools/requirements-dev.txt` --- Tools/{clinic => }/requirements-dev.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Tools/{clinic => }/requirements-dev.txt (100%) diff --git a/Tools/clinic/requirements-dev.txt b/Tools/requirements-dev.txt similarity index 100% rename from Tools/clinic/requirements-dev.txt rename to Tools/requirements-dev.txt From 46af31c8a91a892318127c547fa11576057a441b Mon Sep 17 00:00:00 2001 From: Artyom Romanov Date: Wed, 25 Oct 2023 17:07:32 +0500 Subject: [PATCH 2/4] Fix `mypy.yml` after move `requirements-dev.txt` --- .github/workflows/mypy.yml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml index f089a0b247aeb4..e4eebcde4faf45 100644 --- a/.github/workflows/mypy.yml +++ b/.github/workflows/mypy.yml @@ -7,8 +7,10 @@ on: - main pull_request: paths: - - "Tools/clinic/**" - ".github/workflows/mypy.yml" + - "Tools/clinic/**" + - "Tools/peg_generator/**" + - "Tools/requirements-dev.txt" workflow_dispatch: permissions: @@ -25,7 +27,13 @@ concurrency: jobs: mypy: - name: Run mypy on Tools/clinic/ + strategy: + matrix: + target: [ + "Tools/clinic", + "Tools/peg_generator", + ] + name: Run mypy on ${{ matrix.target }} runs-on: ubuntu-latest timeout-minutes: 10 steps: @@ -34,6 +42,6 @@ jobs: with: python-version: "3.x" cache: pip - cache-dependency-path: Tools/clinic/requirements-dev.txt - - run: pip install -r Tools/clinic/requirements-dev.txt - - run: mypy --config-file Tools/clinic/mypy.ini + cache-dependency-path: Tools/requirements-dev.txt + - run: pip install -r Tools/requirements-dev.txt + - run: mypy --config-file ${{ matrix.target }}/mypy.ini From b9a93e9e618422f31e837ae79d1621768191292f Mon Sep 17 00:00:00 2001 From: Artyom Romanov Date: Wed, 25 Oct 2023 17:22:23 +0500 Subject: [PATCH 3/4] Fix `mypy.yml` after move `requirements-dev.txt` --- .github/workflows/mypy.yml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml index e4eebcde4faf45..67a4af239e18fc 100644 --- a/.github/workflows/mypy.yml +++ b/.github/workflows/mypy.yml @@ -7,10 +7,8 @@ on: - main pull_request: paths: - - ".github/workflows/mypy.yml" - "Tools/clinic/**" - - "Tools/peg_generator/**" - - "Tools/requirements-dev.txt" + - ".github/workflows/mypy.yml" workflow_dispatch: permissions: @@ -27,13 +25,7 @@ concurrency: jobs: mypy: - strategy: - matrix: - target: [ - "Tools/clinic", - "Tools/peg_generator", - ] - name: Run mypy on ${{ matrix.target }} + name: Run mypy on Tools/clinic/ runs-on: ubuntu-latest timeout-minutes: 10 steps: @@ -44,4 +36,4 @@ jobs: cache: pip cache-dependency-path: Tools/requirements-dev.txt - run: pip install -r Tools/requirements-dev.txt - - run: mypy --config-file ${{ matrix.target }}/mypy.ini + - run: mypy --config-file Tools/clinic/mypy.ini From 8205704b4b1afeb6ec0ef0c22bd989c8016926e7 Mon Sep 17 00:00:00 2001 From: Alex Waygood Date: Wed, 25 Oct 2023 13:25:17 +0100 Subject: [PATCH 4/4] and dependabot --- .github/dependabot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f026b0f5f9454a..c8a3165d690364 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -13,7 +13,7 @@ updates: - "version-update:semver-minor" - "version-update:semver-patch" - package-ecosystem: "pip" - directory: "/Tools/clinic/" + directory: "/Tools/" schedule: interval: "monthly" labels: