python · AlexWaygood · Sep 30, 2023 · Sep 30, 2023
diff --git a/pyrightconfig.stricter.json b/pyrightconfig.stricter.json
@@ -74,7 +74,6 @@
         "stubs/stripe",
         "stubs/tqdm",
         "stubs/ttkthemes",
-        "stubs/urllib3",
         "stubs/vobject",
         "stubs/WebOb",
         "stubs/workalendar",

diff --git a/stubs/influxdb-client/METADATA.toml b/stubs/influxdb-client/METADATA.toml
@@ -1,6 +1,7 @@
 version = "1.37.*"
 upstream_repository = "https://github.com/influxdata/influxdb-client-python"
-requires = ["types-urllib3"]
+# requires a version of urllib3 with a py.typed file
+requires = ["urllib3>=2"]
 
 [tool.stubtest]
 extras = ["extra"]

diff --git a/stubs/requests/@tests/stubtest_allowlist.txt b/stubs/requests/@tests/stubtest_allowlist.txt
@@ -1,7 +1,3 @@
-# Re-exports from urllib3 (should be fixed in those stubs, not here)
-requests\.adapters\.PoolManager\..*
-requests\.adapters\.Retry\..*
-
 # Loop variables that leak into the global scope
 requests.packages.mod
 requests.packages.package

diff --git a/stubs/requests/METADATA.toml b/stubs/requests/METADATA.toml
@@ -1,6 +1,7 @@
 version = "2.31.*"
 upstream_repository = "https://github.com/psf/requests"
-requires = ["types-urllib3"]
+# requires a version of urllib3 with a py.typed file
+requires = ["urllib3>=2"]
 
 [tool.stubtest]
 extras = ["socks"]
diff --git a/stubs/urllib3/@tests/stubtest_allowlist.txt b/stubs/urllib3/@tests/stubtest_allowlist.txt
diff --git a/stubs/urllib3/METADATA.toml b/stubs/urllib3/METADATA.toml
diff --git a/stubs/urllib3/urllib3/__init__.pyi b/stubs/urllib3/urllib3/__init__.pyi
diff --git a/stubs/urllib3/urllib3/_collections.pyi b/stubs/urllib3/urllib3/_collections.pyi
diff --git a/stubs/urllib3/urllib3/connection.pyi b/stubs/urllib3/urllib3/connection.pyi
diff --git a/stubs/urllib3/urllib3/connectionpool.pyi b/stubs/urllib3/urllib3/connectionpool.pyi
diff --git a/stubs/urllib3/urllib3/contrib/__init__.pyi b/stubs/urllib3/urllib3/contrib/__init__.pyi
diff --git a/stubs/urllib3/urllib3/contrib/socks.pyi b/stubs/urllib3/urllib3/contrib/socks.pyi