From 9f033bf439e064917e4b235b8a09b7530f182516 Mon Sep 17 00:00:00 2001
From: Alex Waygood <Alex.Waygood@Gmail.com>
Date: Mon, 23 Sep 2024 13:07:57 -0700
Subject: [PATCH] Fixup some pyright CI configuration details (#12690)

---
 .github/workflows/meta_tests.yml | 1 -
 .github/workflows/tests.yml      | 3 ---
 pyrightconfig.stricter.json      | 1 -
 tests/pyright_test.py            | 2 +-
 4 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/.github/workflows/meta_tests.yml b/.github/workflows/meta_tests.yml
index f342bc41f17d..ff62c90ae85d 100644
--- a/.github/workflows/meta_tests.yml
+++ b/.github/workflows/meta_tests.yml
@@ -61,7 +61,6 @@ jobs:
           version: PATH
           python-platform: ${{ matrix.python-platform }}
           python-version: "3.9" # Oldest version supported for running scripts and tests
-          extra-args: --threads
           project: ./pyrightconfig.scripts_and_tests.json
   stubsabot-dry-run:
     name: Stubsabot dry run
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index e19b7ab0c537..e8f08fae3320 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -145,7 +145,6 @@ jobs:
           version: PATH
           python-platform: ${{ matrix.python-platform }}
           python-version: ${{ matrix.python-version }}
-          extra-args: --threads
           annotate: ${{ matrix.python-version == '3.12' && 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
@@ -153,7 +152,6 @@ jobs:
           version: PATH
           python-platform: ${{ matrix.python-platform }}
           python-version: ${{ matrix.python-version }}
-          extra-args: --threads
           annotate: ${{ matrix.python-version == '3.12' && matrix.python-platform == 'Linux' }} # Having each job create the same comment is too noisy.
           project: ./pyrightconfig.stricter.json
       - name: Run pyright on the test cases
@@ -162,7 +160,6 @@ jobs:
           version: PATH
           python-platform: ${{ matrix.python-platform }}
           python-version: ${{ matrix.python-version }}
-          extra-args: --threads
           annotate: ${{ matrix.python-version == '3.12' && matrix.python-platform == 'Linux' }} # Having each job create the same comment is too noisy.
           project: ./pyrightconfig.testcases.json
 
diff --git a/pyrightconfig.stricter.json b/pyrightconfig.stricter.json
index a3ea8b6478dc..594908d69f28 100644
--- a/pyrightconfig.stricter.json
+++ b/pyrightconfig.stricter.json
@@ -100,7 +100,6 @@
         "stubs/vobject",
         "stubs/workalendar",
         "stubs/wurlitzer",
-        "stubs/xdgenvpy"
     ],
     "typeCheckingMode": "strict",
     // TODO: Complete incomplete stubs
diff --git a/tests/pyright_test.py b/tests/pyright_test.py
index 7847512b7527..f6ff93fe1926 100755
--- a/tests/pyright_test.py
+++ b/tests/pyright_test.py
@@ -37,7 +37,7 @@ def main() -> None:
     # version installed into the virtual environment, due to failures on some
     # platforms. https://github.com/python/typeshed/issues/11614
     os.environ["PYRIGHT_PYTHON_FORCE_VERSION"] = pyright_version
-    command = [npx, f"pyright@{pyright_version}"] + sys.argv[1:] + ["--threads"]
+    command = [npx, f"pyright@{pyright_version}"] + sys.argv[1:]
     print_command(command)
 
     ret = subprocess.run(command).returncode