Merge pull request #1258 from henryiii/henryiii/chore/dev

chore: nicer tracebacks and dev improvements

bin/inspect_all_known_projects.py

@@ -1,4 +1,17 @@
 #!/usr/bin/env python3
+
+"""
+Check known projects for usage of requires-python.
+
+Usage:
+
+    ./bin/inspect_all_known_projects.py --online=$GITHUB_TOKEN
+
+This will cache the results to all_known_setup.yaml; you can reprint
+the results without the `--online` setting.
+"""
+
+
 from __future__ import annotations
 
 import ast
@@ -7,7 +20,7 @@ from typing import Iterator
 
 import click
 import yaml
-from ghapi.core import GhApi, HTTP404NotFoundError
+from github import Github, GithubException
 from rich import print
 
 from cibuildwheel.projectfiles import Analyzer
@@ -47,33 +60,38 @@ def check_repo(name: str, contents: str) -> str:
 
 
 class MaybeRemote:
-    def __init__(self, cached_file: Path | str, *, online: bool) -> None:
-        self.online = online
-        if self.online:
-            self.contents: dict[str, dict[str, str | None]] = {
+    github: Github | None
+    contents: dict[str, dict[str, str | None]]
+
+    def __init__(self, cached_file: Path | str, *, online: str | None) -> None:
+        if online is not None:
+            self.github = Github(online)
+            self.contents = {
                 "setup.py": {},
                 "setup.cfg": {},
                 "pyproject.toml": {},
             }
         else:
+            self.github = None
             with open(cached_file) as f:
                 self.contents = yaml.safe_load(f)
 
     def get(self, repo: str, filename: str) -> str | None:
-        if self.online:
+        if self.github:
             try:
-                self.contents[filename][repo] = (
-                    GhApi(*repo.split("/")).get_content(filename).decode()
-                )
-            except HTTP404NotFoundError:
+                gh_file = self.github.get_repo(repo).get_contents(filename)
+            except GithubException:
                 self.contents[filename][repo] = None
+            else:
+                assert not isinstance(gh_file, list)
+                self.contents[filename][repo] = gh_file.decoded_content.decode(encoding="utf-8")
+
             return self.contents[filename][repo]
         elif repo in self.contents[filename]:
             return self.contents[filename][repo]
         else:
-            raise RuntimeError(
-                f"Trying to access {repo}:{filename} and not in cache, rebuild cache"
-            )
+            msg = f"Trying to access {repo}:{filename} and not in cache, rebuild cache"
+            raise RuntimeError(msg)
 
     def save(self, filename: Path | str) -> None:
         with open(filename, "w") as f:
@@ -87,8 +105,8 @@ class MaybeRemote:
 
 
 @click.command()
-@click.option("--online", is_flag=True, help="Remember to set GITHUB_TOKEN")
-def main(online: bool) -> None:
+@click.option("--online", help="Set to $GITHUB_TOKEN")
+def main(online: str | None) -> None:
     with open(DIR / "../docs/data/projects.yml") as f:
         known = yaml.safe_load(f)
 

bin/run_example_ci_configs.py

@@ -81,7 +81,8 @@ def ci_service_for_config_file(config_file):
         if service.name == service_name:
             return service
 
-    raise ValueError(f"unknown ci service for config file {config_file}")
+    msg = f"unknown ci service for config file {config_file}"
+    raise ValueError(msg)
 
 
 @click.command()
@@ -100,7 +101,8 @@ def run_example_ci_configs(config_files=None):
     for config_file in config_files:
         service = ci_service_for_config_file(config_file)
         if service.name in configs_by_service:
-            raise Exception("You cannot specify more than one config per CI service")
+            msg = "You cannot specify more than one config per CI service"
+            raise Exception(msg)
         configs_by_service[service.name] = config_file
 
     if git_repo_has_changes():

bin/update_pythons.py

@@ -141,7 +141,8 @@ class PyPyVersions:
         releases = [r for r in releases if self.get_arch_file(r)]
 
         if not releases:
-            raise RuntimeError(f"PyPy Win {self.arch} not found for {spec}! {self.releases}")
+            msg = f"PyPy Win {self.arch} not found for {spec}! {self.releases}"
+            raise RuntimeError(msg)
 
         version_arch = "win32" if self.arch == "32" else "win_amd64"
 
@@ -159,13 +160,15 @@ class PyPyVersions:
 
     def update_version_macos(self, spec: Specifier) -> ConfigMacOS:
         if self.arch != "64":
-            raise RuntimeError("Other archs not supported yet on macOS")
+            msg = "Other archs not supported yet on macOS"
+            raise RuntimeError(msg)
 
         releases = [r for r in self.releases if spec.contains(r["python_version"])]
         releases = sorted(releases, key=lambda r: r["pypy_version"])  # type: ignore[no-any-return]
 
         if not releases:
-            raise RuntimeError(f"PyPy macOS {self.arch} not found for {spec}!")
+            msg = f"PyPy macOS {self.arch} not found for {spec}!"
+            raise RuntimeError(msg)
 
         release = releases[-1]
         version = release["python_version"]