Deduplicate pinned pyright version (#9299)

Avasam · AlexWaygood · web-flow · commit 5c3f10e1df3d · 2022-11-30T08:52:55.000Z
Co-authored-by: Alex Waygood &lt;Alex.Waygood@Gmail.com&gt;
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -110,27 +110,31 @@ jobs:
         python-platform: ["Linux", "Windows", "Darwin"]
         python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
       fail-fast: false
-    env:
-      PYRIGHT_VERSION: 1.1.278 # Must match pyright_test.py.
     steps:
       - uses: actions/checkout@v3
+      - name: Get pyright version
+        uses: SebRollen/toml-action@v1.0.2
+        id: pyright_version
+        with:
+          file: 'pyproject.toml'
+          field: 'tool.typeshed.pyright_version'
       - uses: jakebailey/pyright-action@v1
         with:
-          version: ${{ env.PYRIGHT_VERSION }}
+          version: ${{ steps.pyright_version.outputs.value }}
           python-platform: ${{ matrix.python-platform }}
           python-version: ${{ matrix.python-version }}
           no-comments: ${{ matrix.python-version != '3.10' || matrix.python-platform != 'Linux' }} # Having each job create the same comment is too noisy.
           project: ./pyrightconfig.stricter.json
       - uses: jakebailey/pyright-action@v1
         with:
-          version: ${{ env.PYRIGHT_VERSION }}
+          version: ${{ steps.pyright_version.outputs.value }}
           python-platform: ${{ matrix.python-platform }}
           python-version: ${{ matrix.python-version }}
           no-comments: ${{ matrix.python-version != '3.10' || matrix.python-platform != 'Linux' }} # Having each job create the same comment is too noisy.
           project: ./pyrightconfig.testcases.json
       - uses: jakebailey/pyright-action@v1
         with:
-          version: ${{ env.PYRIGHT_VERSION }}
+          version: ${{ steps.pyright_version.outputs.value }}
           python-platform: ${{ matrix.python-platform }}
           python-version: ${{ matrix.python-version }}
           no-comments: ${{ matrix.python-version != '3.10' || matrix.python-platform != 'Linux' }}  # Having each job create the same comment is too noisy.
diff --git a/pyproject.toml b/pyproject.toml
@@ -59,3 +59,6 @@ extra_standard_library = [
 [tool.pycln]
 all = true
 disable_all_dunder_policy = true
+
+[tool.typeshed]
+pyright_version = "1.1.278"
diff --git a/tests/pyright_test.py b/tests/pyright_test.py
@@ -6,7 +6,8 @@
 import sys
 from pathlib import Path
 
-_PYRIGHT_VERSION = "1.1.278"  # Must match .github/workflows/tests.yml.
+import tomli
+
 _WELL_KNOWN_FILE = Path("tests", "pyright_test.py")
 
 
@@ -28,8 +29,11 @@ def main() -> None:
         print("error running npx; is Node.js installed?", file=sys.stderr)
         sys.exit(1)
 
-    os.environ["PYRIGHT_PYTHON_FORCE_VERSION"] = _PYRIGHT_VERSION
-    command = [npx, f"pyright@{_PYRIGHT_VERSION}"] + sys.argv[1:]
+    with open("pyproject.toml", "rb") as config:
+        pyright_version: str = tomli.load(config)["tool"]["typeshed"]["pyright_version"]
+
+    os.environ["PYRIGHT_PYTHON_FORCE_VERSION"] = pyright_version
+    command = [npx, f"pyright@{pyright_version}"] + sys.argv[1:]
     print("Running:", " ".join(command))
 
     ret = subprocess.run(command).returncode
