From b61d90c6f5dc4600055916f98c0e63deec0546e9 Mon Sep 17 00:00:00 2001 From: Jake Bailey <5341706+jakebailey@users.noreply.github.com> Date: Fri, 12 Apr 2024 10:19:35 -0700 Subject: [PATCH] Use 'version: PATH' for pyright-action (#11743) This eliminates the need to parse out a pyright version, download, etc, if the environment already has it installed, which is the case for the workflows in this repo. --- .github/workflows/meta_tests.yml | 8 +------- .github/workflows/tests.yml | 12 +++--------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/.github/workflows/meta_tests.yml b/.github/workflows/meta_tests.yml index cca055306b2a..8586ba4f4f0c 100644 --- a/.github/workflows/meta_tests.yml +++ b/.github/workflows/meta_tests.yml @@ -56,16 +56,10 @@ jobs: python-version: "3.11" - run: curl -LsSf https://astral.sh/uv/install.sh | sh - run: uv pip install -r requirements-tests.txt --system - - name: Get pyright version - id: pyright_version - run: | - PYRIGHT_VERSION=$(grep pyright== requirements-tests.txt | cut -d "#" -f 1 | cut -d \; -f 1 | cut -d = -f 3) - echo pyright version: "${PYRIGHT_VERSION}" - echo PYRIGHT_VERSION="${PYRIGHT_VERSION}" >> "${GITHUB_OUTPUT}" - name: Run pyright on typeshed uses: jakebailey/pyright-action@v2 with: - version: ${{ steps.pyright_version.outputs.PYRIGHT_VERSION }} + version: PATH python-platform: ${{ matrix.python-platform }} python-version: "3.9" # The Python version to test against. project: ./pyrightconfig.scripts_and_tests.json diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 096b38675524..9e01a33fef62 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -129,23 +129,17 @@ jobs: run: echo "$PWD/.venv/bin" >> $GITHUB_PATH - name: List 3rd-party stub dependencies installed run: uv pip freeze - - name: Get pyright version - id: pyright_version - run: | - PYRIGHT_VERSION=$(grep pyright== requirements-tests.txt | cut -d "#" -f 1 | cut -d \; -f 1 | cut -d = -f 3) - echo pyright version: "${PYRIGHT_VERSION}" - echo PYRIGHT_VERSION="${PYRIGHT_VERSION}" >> "${GITHUB_OUTPUT}" - name: Run pyright with basic settings on all the stubs uses: jakebailey/pyright-action@v2 with: - version: ${{ steps.pyright_version.outputs.PYRIGHT_VERSION }} + version: PATH python-platform: ${{ matrix.python-platform }} python-version: ${{ matrix.python-version }} annotate: ${{ matrix.python-version == '3.11' && matrix.python-platform == 'Linux' }} # Having each job create the same comment is too noisy. - name: Run pyright with stricter settings on some of the stubs uses: jakebailey/pyright-action@v2 with: - version: ${{ steps.pyright_version.outputs.PYRIGHT_VERSION }} + version: PATH python-platform: ${{ matrix.python-platform }} python-version: ${{ matrix.python-version }} annotate: ${{ matrix.python-version == '3.11' && matrix.python-platform == 'Linux' }} # Having each job create the same comment is too noisy. @@ -153,7 +147,7 @@ jobs: - name: Run pyright on the test cases uses: jakebailey/pyright-action@v2 with: - version: ${{ steps.pyright_version.outputs.PYRIGHT_VERSION }} + version: PATH python-platform: ${{ matrix.python-platform }} python-version: ${{ matrix.python-version }} annotate: ${{ matrix.python-version == '3.11' && matrix.python-platform == 'Linux' }} # Having each job create the same comment is too noisy.