Support extras in stubtest_third_party.py (#8467)

Kevin Kirsche · web-flow · commit 8c51fab4e269 · 2022-08-18T14:12:36.000-07:00
diff --git a/stubs/beautifulsoup4/@tests/requirements-stubtest.txt b/stubs/beautifulsoup4/@tests/requirements-stubtest.txt
diff --git a/stubs/beautifulsoup4/METADATA.toml b/stubs/beautifulsoup4/METADATA.toml
@@ -1 +1,4 @@
 version = "4.11.*"
+
+[tool.stubtest]
+extras = ["lxml", "html5lib"]
diff --git a/stubs/html5lib/@tests/requirements-stubtest.txt b/stubs/html5lib/@tests/requirements-stubtest.txt
diff --git a/stubs/html5lib/METADATA.toml b/stubs/html5lib/METADATA.toml
@@ -1 +1,4 @@
 version = "1.1.*"
+
+[tool.stubtest]
+extras = ["all"]
diff --git a/stubs/requests/@tests/requirements-stubtest.txt b/stubs/requests/@tests/requirements-stubtest.txt
diff --git a/stubs/requests/METADATA.toml b/stubs/requests/METADATA.toml
@@ -1,2 +1,5 @@
 version = "2.28.*"
 requires = ["types-urllib3<1.27"] # keep in sync with requests's setup.py
+
+[tool.stubtest]
+extras = ["socks"]
diff --git a/stubs/tqdm/@tests/requirements-stubtest.txt b/stubs/tqdm/@tests/requirements-stubtest.txt
@@ -2,5 +2,3 @@ tensorflow
 pandas
 dask
 rich
-requests
-slack-sdk
diff --git a/stubs/tqdm/METADATA.toml b/stubs/tqdm/METADATA.toml
@@ -1 +1,4 @@
 version = "4.64.*"
+
+[tool.stubtest]
+extras = ["slack", "telegram"]
diff --git a/stubs/urllib3/@tests/requirements-stubtest.txt b/stubs/urllib3/@tests/requirements-stubtest.txt
diff --git a/stubs/urllib3/METADATA.toml b/stubs/urllib3/METADATA.toml
@@ -1 +1,4 @@
 version = "1.26.*"
+
+[tool.stubtest]
+extras = ["socks"]
diff --git a/tests/check_consistent.py b/tests/check_consistent.py
@@ -14,7 +14,7 @@
 from packaging.version import Version
 
 metadata_keys = {"version", "requires", "extra_description", "obsolete_since", "no_longer_updated", "tool"}
-tool_keys = {"stubtest": {"skip", "apt_dependencies", "ignore_missing_stub"}}
+tool_keys = {"stubtest": {"skip", "apt_dependencies", "extras", "ignore_missing_stub"}}
 allowed_files = {"README.md"}
 
 
diff --git a/tests/stubtest_third_party.py b/tests/stubtest_third_party.py
@@ -41,8 +41,11 @@ def run_stubtest(dist: Path, *, verbose: bool = False) -> bool:
         python_exe = str(venv_dir / "bin" / "python")
 
         dist_version = metadata["version"]
+        extras = stubtest_meta.get("extras", [])
         assert isinstance(dist_version, str)
-        dist_req = f"{dist.name}=={dist_version}"
+        assert isinstance(extras, list)
+        dist_extras = ", ".join(extras)
+        dist_req = f"{dist.name}[{dist_extras}]=={dist_version}"
 
         # If @tests/requirements-stubtest.txt exists, run "pip install" on it.
         req_path = dist / "@tests" / "requirements-stubtest.txt"
