More Cleanup

Author: jtpio

.github/workflows/draft-changelog.yml

@@ -36,7 +36,7 @@ jobs:
         id: draft-changelog
         uses: ./.github/actions/draft-changelog
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
           version_spec: ${{ github.event.inputs.version_spec }}
           target: ${{ github.event.inputs.target }}
           branch: ${{ github.event.inputs.branch }}

jupyter_releaser/cli.py

@@ -62,12 +62,18 @@ def invoke(self, ctx):
             if param.envvar and os.environ.get(param.envvar):
                 continue
             name = param.name
-            if name in options:
+            if name in options or name.replace("_", "-") in options:
                 arg = f"--{name.replace('_', '-')}"
                 # Defer to cli overrides
                 if arg not in ctx.args:
-                    ctx.args.append(arg)
-                    ctx.args.append(options[name])
+                    val = options.get(name, options.get(name.replace("_", "-")))
+                    if isinstance(val, list):
+                        for v in val:
+                            ctx.args.append(arg)
+                            ctx.args.append(v)
+                    else:
+                        ctx.args.append(arg)
+                        ctx.args.append(val)
 
         # Handle before hooks
         before = f"before-{cmd_name}"
@@ -330,11 +336,6 @@ def check_manifest():
 @click.option(
     "--ignore-links",
     multiple=True,
-    default=[
-        "https://github.com/.*/(pull|issues)/.*",
-        "https://github.com/search?",
-        "http://localhost.*",
-    ],
     help="Ignore links based on regex pattern(s)",
 )
 @click.option(

jupyter_releaser/lib.py

@@ -56,6 +56,12 @@ def check_links(ignore_glob, ignore_links, cache_file, links_expire):
         cmd += f' --ignore-glob "{spec}"'
         ignored.extend(glob(spec, recursive=True))
 
+    ignore_links = list(ignore_links) + [
+        "https://github.com/.*/(pull|issues)/.*",
+        "https://github.com/search?",
+        "http://localhost.*",
+    ]
+
     for spec in ignore_links:
         cmd += f' --check-links-ignore "{spec}"'
 
@@ -67,12 +73,14 @@ def check_links(ignore_glob, ignore_links, cache_file, links_expire):
         matched = glob(f"**/*{ext}", recursive=True)
         files.extend(m for m in matched if not m in ignored)
 
-    cmd += ' "' + '" "'.join(files) + '"'
-
-    try:
-        util.run(cmd)
-    except Exception:
-        util.run(cmd + " --lf")
+    for f in files:
+        file_cmd = cmd + f' "{f}"'
+        try:
+            util.run(file_cmd)
+        except Exception as e:
+            # Return code 5 means no tests were run (no links found)
+            if e.returncode != 5:
+                util.run(file_cmd + " --lf")
 
 
 def draft_changelog(version_spec, branch, repo, auth, dry_run):

jupyter_releaser/tests/test_cli.py

@@ -242,7 +242,13 @@ def test_check_links(py_package, runner):
     text = readme.read_text(encoding="utf-8")
     text += "\nhttps://apod.nasa.gov/apod/astropix.html"
     readme.write_text(text, encoding="utf-8")
-    util.run("git commit -a -m 'update readme'")
+
+    pyproject = util.toml.loads(util.PYPROJECT.read_text(encoding="utf-8"))
+    pyproject["tool"] = {"jupyter-releaser": dict()}
+    pyproject["tool"]["jupyter-releaser"]["options"] = {"ignore-glob": ["FOO.md"]}
+    util.PYPROJECT.write_text(util.toml.dumps(pyproject), encoding="utf-8")
+
+    util.run("git commit -a -m 'update files'")
 
     runner(["prep-git", "--git-url", py_package])
     runner(["check-links"])
@@ -253,7 +259,7 @@ def test_check_links(py_package, runner):
     bar = Path(util.CHECKOUT_NAME) / "BAR BAZ.md"
     bar.write_text("")
 
-    runner(["check-links", "--ignore-glob", "FOO.md"])
+    runner(["check-links"])
 
 
 def test_check_changelog(py_package, tmp_path, mocker, runner, git_prep):