Format with black

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Ggg4AutCcRdK8c57NMxSqp

Author: claude

dataherb/catalog/add.py

@@ -164,9 +164,7 @@ def add_repos(
             )
             continue
         did = str(existing["id"]) if existing else default_id(repo, strip_prefix)
-        target = (
-            cfg.path(existing["_file"]) if existing else out_dir / f"{did}.{fmt}"
-        )
+        target = cfg.path(existing["_file"]) if existing else out_dir / f"{did}.{fmt}"
         if not existing and (did in known_ids or target.exists()) and not force:
             results.append(
                 Added(repo, did, target, "skipped", f"id '{did}' is already taken")
@@ -200,15 +198,20 @@ def add_repos(
                         )
                     )
                     continue
-                found = next((c for c in METADATA_CANDIDATES if (dest / c).exists()), None)
+                found = next(
+                    (c for c in METADATA_CANDIDATES if (dest / c).exists()), None
+                )
                 if found is None:
                     inferred = scaffold(dest, dataset_id=did)
 
         if inferred is not None:
             entry["inline"] = True
             for k in ("name", "description", "datapackage"):
                 entry[k] = inferred[k]
-            kind, note = "inline", f"no metadata in the repo; inferred {len(inferred['datapackage']['resources'])} resource(s)"
+            kind, note = (
+                "inline",
+                f"no metadata in the repo; inferred {len(inferred['datapackage']['resources'])} resource(s)",
+            )
         else:
             kind, note = "pointer", f"reads {found}"
         if tags:

dataherb/catalog/util.py

@@ -28,7 +28,9 @@ def load_structured(text: str | bytes, name: str = "") -> Any:
     return yaml.safe_load(text)
 
 
-_FRONT_MATTER = re.compile(r"\A---[ \t]*\r?\n(.*?)^(?:---|\.\.\.)[ \t]*(?:\r?\n|\Z)", re.S | re.M)
+_FRONT_MATTER = re.compile(
+    r"\A---[ \t]*\r?\n(.*?)^(?:---|\.\.\.)[ \t]*(?:\r?\n|\Z)", re.S | re.M
+)
 
 
 def split_front_matter(text: str) -> tuple[Any, str]:

dataherb/cmd/catalog.py

@@ -135,14 +135,18 @@ def lint(config_path, min_score):
 )
 @click.option("--store", "store_name", help="Git store from the config.")
 @click.option("--ref", help="Branch, tag or sha to pin.")
-@click.option("--tag", "tags", multiple=True, help="Tag for the new entries. Repeatable.")
+@click.option(
+    "--tag", "tags", multiple=True, help="Tag for the new entries. Repeatable."
+)
 @click.option(
     "--api-url",
     default="https://api.github.com",
     show_default=True,
     help="GitHub API, for --org (GitHub Enterprise: https://HOST/api/v3).",
 )
-@click.option("--include-archived", is_flag=True, help="With --org: keep archived repos.")
+@click.option(
+    "--include-archived", is_flag=True, help="With --org: keep archived repos."
+)
 @click.option(
     "--format",
     "fmt",
@@ -209,12 +213,16 @@ def add_to_catalog(
     )
     colors = {"pointer": "green", "inline": "green", "skipped": "yellow"}
     for r in results:
-        where = r.path.relative_to(cfg.root) if r.path and r.path.is_relative_to(cfg.root) else (r.path or "-")
-        click.secho(
-            f"{r.kind:<8} {r.repo} -> {where}  ({r.note})", fg=colors[r.kind]
+        where = (
+            r.path.relative_to(cfg.root)
+            if r.path and r.path.is_relative_to(cfg.root)
+            else (r.path or "-")
         )
+        click.secho(f"{r.kind:<8} {r.repo} -> {where}  ({r.note})", fg=colors[r.kind])
     added = sum(r.kind != "skipped" for r in results)
-    click.echo(f"{'would add' if dry_run else 'added'} {added} of {len(results)} repo(s)")
+    click.echo(
+        f"{'would add' if dry_run else 'added'} {added} of {len(results)} repo(s)"
+    )
 
 
 @catalog.command("serve")

tests/catalog/test_add.py

@@ -16,7 +16,9 @@ def _git_repo(path, files):
     for name, text in files.items():
         (path / name).parent.mkdir(parents=True, exist_ok=True)
         (path / name).write_text(text)
-    run = lambda *a: subprocess.run(["git", *a], cwd=path, check=True, capture_output=True)  # noqa: E731
+    run = lambda *a: subprocess.run(
+        ["git", *a], cwd=path, check=True, capture_output=True
+    )  # noqa: E731
     run("init", "-q")
     run("add", ".")
     run("-c", "user.name=t", "-c", "user.email=t@t", "commit", "-qm", "init")
@@ -60,7 +62,10 @@ def test_add_pointer_inline_and_skip(project, tmp_path):
     assert r0["path"] == "data/x.csv" and r0["rows"] == 2
     assert not (project / "catalog" / "gone.md").exists()
 
-    ds = {d["id"]: d for d in build_catalog(load_config(project / "dataherb.config.yml")).datasets}
+    ds = {
+        d["id"]: d
+        for d in build_catalog(load_config(project / "dataherb.config.yml")).datasets
+    }
     assert ds["meta"]["name"] == "Meta"
     assert ds["raw"]["resources"][0]["url"].endswith("/git/acme/raw/HEAD/data/x.csv")
 
@@ -82,7 +87,10 @@ def fake_get(url, headers=None, timeout=20.0):
 
     monkeypatch.setattr(add_mod, "http_get", fake_get)
     assert list_org_repos("o", "dataset") == ["o/dataset-a"]
-    assert list_org_repos("o", "dataset", include_archived=True) == ["o/Dataset-b", "o/dataset-a"]
+    assert list_org_repos("o", "dataset", include_archived=True) == [
+        "o/Dataset-b",
+        "o/dataset-a",
+    ]
     assert seen[0].startswith("https://api.github.com/orgs/o/repos?")
 
 
@@ -92,7 +100,14 @@ def test_cli_dry_run(project):
     (meta_dir / "dataherb.json").write_text("{}")
     res = CliRunner().invoke(
         dataherb,
-        ["catalog", "add", "-c", str(project / "dataherb.config.yml"), "--dry-run", "acme/meta"],
+        [
+            "catalog",
+            "add",
+            "-c",
+            str(project / "dataherb.config.yml"),
+            "--dry-run",
+            "acme/meta",
+        ],
     )
     assert res.exit_code == 0, res.output
     assert "pointer" in res.output and "would add 1 of 1" in res.output
@@ -117,4 +132,7 @@ def test_yml_format(project):
     meta_dir.mkdir(parents=True)
     (meta_dir / "dataherb.json").write_text("{}")
     add_repos(load_config(project / "dataherb.config.yml"), ["acme/meta"], fmt="yml")
-    assert yaml.safe_load((project / "catalog" / "meta.yml").read_text())["repo"] == "acme/meta"
+    assert (
+        yaml.safe_load((project / "catalog" / "meta.yml").read_text())["repo"]
+        == "acme/meta"
+    )

tests/catalog/test_catalog.py

@@ -51,7 +51,9 @@ def test_markdown_entries(project):
         "---\nid: orders\nrepo: acme/orders\nref: main\ntags: [sales]\n---\n\n"
         "## Caveats\n\nRefunds arrive a day late.\n"
     )
-    (cat / "README.md").write_text("# About this folder\n")  # no front matter: not an entry
+    (cat / "README.md").write_text(
+        "# About this folder\n"
+    )  # no front matter: not an entry
     (cat / "notes.md").write_text("---\nid: notes-ds\ninline: true\nname: Notes\n---\n")
     res = build_catalog(load_config(project / "dataherb.config.yml"))
     ds = by_id(res)