From e17a9271725b703579ad112c54ac5e3f31745fa7 Mon Sep 17 00:00:00 2001 From: Akuli Date: Thu, 29 Sep 2022 11:29:40 +0300 Subject: [PATCH 1/5] Install all dependencies (including pathspec) in daily third-party stubtest Also fix tests.yml --- .github/workflows/daily.yml | 2 +- .github/workflows/tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index d0fe6f6cb227..080982f395dc 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -50,7 +50,7 @@ jobs: with: python-version: "3.9" - name: Install dependencies - run: pip install $(grep tomli== requirements-tests.txt) termcolor + run: pip install -r requirements-tests.txt - name: Install apt packages run: | sudo apt update diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 86bb88f31474..c49dc005bae7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -137,7 +137,7 @@ jobs: with: python-version: "3.9" - name: Install dependencies - run: pip install $(grep tomli== requirements-tests.txt) termcolor + run: pip install -r requirements-tests.txt - name: Run stubtest run: | STUBS=$( From d4ca397a6ad757c64deff88c9356870ee519d651 Mon Sep 17 00:00:00 2001 From: Akuli Date: Thu, 29 Sep 2022 11:37:46 +0300 Subject: [PATCH 2/5] Actually, install only what we need --- .github/workflows/daily.yml | 2 +- .github/workflows/tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index 080982f395dc..ed0681776843 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -50,7 +50,7 @@ jobs: with: python-version: "3.9" - name: Install dependencies - run: pip install -r requirements-tests.txt + run: pip install $(grep -E 'tomli|termcolor|pathspec' requirements-tests.txt) - name: Install apt packages run: | sudo apt update diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c49dc005bae7..9636e31a4599 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -137,7 +137,7 @@ jobs: with: python-version: "3.9" - name: Install dependencies - run: pip install -r requirements-tests.txt + run: pip install $(grep -E 'tomli|termcolor|pathspec' requirements-tests.txt) - name: Run stubtest run: | STUBS=$( From 9d21e7d9ceb695264ef632fb4ee1632d58172c16 Mon Sep 17 00:00:00 2001 From: Akuli Date: Thu, 29 Sep 2022 11:40:16 +0300 Subject: [PATCH 3/5] Revert "Actually, install only what we need" This reverts commit d4ca397a6ad757c64deff88c9356870ee519d651. --- .github/workflows/daily.yml | 2 +- .github/workflows/tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index ed0681776843..080982f395dc 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -50,7 +50,7 @@ jobs: with: python-version: "3.9" - name: Install dependencies - run: pip install $(grep -E 'tomli|termcolor|pathspec' requirements-tests.txt) + run: pip install -r requirements-tests.txt - name: Install apt packages run: | sudo apt update diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9636e31a4599..c49dc005bae7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -137,7 +137,7 @@ jobs: with: python-version: "3.9" - name: Install dependencies - run: pip install $(grep -E 'tomli|termcolor|pathspec' requirements-tests.txt) + run: pip install -r requirements-tests.txt - name: Run stubtest run: | STUBS=$( From 74baebc7daf97178d5f7e4def3f8acebb192e43c Mon Sep 17 00:00:00 2001 From: Akuli Date: Thu, 29 Sep 2022 11:46:56 +0300 Subject: [PATCH 4/5] TEMPORARILY modify a stub to trigger ci --- stubs/appdirs/appdirs.pyi | 1 + 1 file changed, 1 insertion(+) diff --git a/stubs/appdirs/appdirs.pyi b/stubs/appdirs/appdirs.pyi index d7c1c5526b90..2845e136cd4e 100644 --- a/stubs/appdirs/appdirs.pyi +++ b/stubs/appdirs/appdirs.pyi @@ -1,4 +1,5 @@ __version_info__: tuple[int, int, int] + PY3: bool unicode = str system: str From 24a87a6bd13ef93803e35d79bcc10e5036228c68 Mon Sep 17 00:00:00 2001 From: Akuli Date: Thu, 29 Sep 2022 11:49:38 +0300 Subject: [PATCH 5/5] Revert "TEMPORARILY modify a stub to trigger ci" This reverts commit 74baebc7daf97178d5f7e4def3f8acebb192e43c. --- stubs/appdirs/appdirs.pyi | 1 - 1 file changed, 1 deletion(-) diff --git a/stubs/appdirs/appdirs.pyi b/stubs/appdirs/appdirs.pyi index 2845e136cd4e..d7c1c5526b90 100644 --- a/stubs/appdirs/appdirs.pyi +++ b/stubs/appdirs/appdirs.pyi @@ -1,5 +1,4 @@ __version_info__: tuple[int, int, int] - PY3: bool unicode = str system: str