From 59624ff09cd38747602ffea154826015c751dcd3 Mon Sep 17 00:00:00 2001
From: Eric Traut <eric@traut.com>
Date: Fri, 6 Aug 2021 00:21:57 -0700
Subject: [PATCH] Updated pyright version to 1.1.160 (#5857)

* Updated pyright version to 1.1.160. Older versions contained a bug that prevented multiple third-party stub packages from having the same top-level module name.

* Disabled "reportUnsupportedDunderAll" diagnostic check for now.

Co-authored-by: Eric Traut <erictr@microsoft.com>
---
 .github/workflows/tests.yml | 2 +-
 pyrightconfig.json          | 8 +++++---
 pyrightconfig.stricter.json | 8 +++++---
 tests/pyright_test.py       | 2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 7121955d7..3b1c59b3a 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -77,7 +77,7 @@ jobs:
         python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
       fail-fast: false
     env:
-      PYRIGHT_VERSION: 1.1.152  # Must match pyright_test.py.
+      PYRIGHT_VERSION: 1.1.160 # Must match pyright_test.py.
     steps:
       - uses: actions/checkout@v2
       - uses: jakebailey/pyright-action@v1
diff --git a/pyrightconfig.json b/pyrightconfig.json
index 539327753..6aa021cac 100644
--- a/pyrightconfig.json
+++ b/pyrightconfig.json
@@ -51,7 +51,6 @@
     "reportUndefinedVariable": "error",
     "reportUnboundVariable": "error",
     "reportInvalidStubStatement": "error",
-    "reportUnsupportedDunderAll": "error",
     "reportInvalidTypeVarUse": "error",
     "reportPropertyTypeMismatch": "error",
     "reportSelfClsParameterName": "error",
@@ -59,5 +58,8 @@
     // of the "factions.Fraction.__pow__" method and "tasks.gather" function.
     // Mypy's overlapping overload logic misses these issues (see mypy
     // issue #10143 and #10157).
-    "reportOverlappingOverload": "none"
-}
+    "reportOverlappingOverload": "none",
+    // Several stubs refer to symbols in __all__ that are conditionally
+    // declared based on platform or version checks.
+    "reportUnsupportedDunderAll": "none",
+}
\ No newline at end of file
diff --git a/pyrightconfig.stricter.json b/pyrightconfig.stricter.json
index 129beea45..99fc60d72 100644
--- a/pyrightconfig.stricter.json
+++ b/pyrightconfig.stricter.json
@@ -103,7 +103,6 @@
     "reportUndefinedVariable": "error",
     "reportUnboundVariable": "error",
     "reportInvalidStubStatement": "error",
-    "reportUnsupportedDunderAll": "error",
     "reportInvalidTypeVarUse": "error",
     "reportPropertyTypeMismatch": "error",
     "reportSelfClsParameterName": "error",
@@ -111,5 +110,8 @@
     // of the "factions.Fraction.__pow__" method and "tasks.gather" function.
     // Mypy's overlapping overload logic misses these issues (see mypy
     // issue #10143 and #10157).
-    "reportOverlappingOverload": "none"
-}
+    "reportOverlappingOverload": "none",
+    // Several stubs refer to symbols in __all__ that are conditionally
+    // declared based on platform or version checks.
+    "reportUnsupportedDunderAll": "none",
+}
\ No newline at end of file
diff --git a/tests/pyright_test.py b/tests/pyright_test.py
index cb755aa6f..789c1e849 100755
--- a/tests/pyright_test.py
+++ b/tests/pyright_test.py
@@ -5,7 +5,7 @@ import subprocess
 import sys
 from pathlib import Path
 
-_PYRIGHT_VERSION = "1.1.152"  # Must match tests.yml.
+_PYRIGHT_VERSION = "1.1.160"  # Must match tests.yml.
 _WELL_KNOWN_FILE = Path("tests", "pyright_test.py")