Merge pull request #258 from blink1073/twine-strict

Author: blink1073

jupyter_releaser/cli.py

@@ -254,6 +254,15 @@ def main(force):
     )
 ]
 
+pydist_check_options = [
+    click.option(
+        "--pydist-check-cmd",
+        envvar="RH_PYDIST_CHECK_CMD",
+        default="twine check --strict",
+        help="The command to use to check a python distribution file",
+    )
+]
+
 
 def add_options(options):
     """Add extracted common options to a click command"""
@@ -414,15 +423,18 @@ def build_python(dist_dir, python_packages):
 @main.command()
 @add_options(dist_dir_options)
 @add_options(check_imports_options)
+@add_options(pydist_check_options)
 @use_checkout_dir()
-def check_python(dist_dir, check_imports):
+def check_python(dist_dir, check_imports, pydist_check_cmd):
     """Check Python dist files"""
     for dist_file in glob(f"{dist_dir}/*"):
         if Path(dist_file).suffix not in [".gz", ".whl"]:
             util.log(f"Skipping non-python dist file {dist_file}")
             continue
 
-        python.check_dist(dist_file, python_imports=check_imports)
+        python.check_dist(
+            dist_file, python_imports=check_imports, check_cmd=pydist_check_cmd
+        )
 
 
 @main.command()
@@ -587,10 +599,15 @@ def delete_release(auth, release_url):
 @add_options(dist_dir_options)
 @add_options(dry_run_options)
 @add_options(npm_install_options)
+@add_options(pydist_check_options)
 @click.argument("release-url", nargs=1)
-def extract_release(auth, dist_dir, dry_run, release_url, npm_install_options):
+def extract_release(
+    auth, dist_dir, dry_run, release_url, npm_install_options, pydist_check_cmd
+):
     """Download and verify assets from a draft GitHub release"""
-    lib.extract_release(auth, dist_dir, dry_run, release_url, npm_install_options)
+    lib.extract_release(
+        auth, dist_dir, dry_run, release_url, npm_install_options, pydist_check_cmd
+    )
 
 
 @main.command()

jupyter_releaser/lib.py

@@ -284,7 +284,9 @@ def delete_release(auth, release_url):
     gh.repos.delete_release(release.id)
 
 
-def extract_release(auth, dist_dir, dry_run, release_url, npm_install_options):
+def extract_release(
+    auth, dist_dir, dry_run, release_url, npm_install_options, pydist_check_cmd
+):
     """Download and verify assets from a draft GitHub release"""
     match = parse_release_url(release_url)
     owner, repo = match["owner"], match["repo"]
@@ -329,7 +331,7 @@ def extract_release(auth, dist_dir, dry_run, release_url, npm_install_options):
     for asset in assets:
         suffix = Path(asset.name).suffix
         if suffix in [".gz", ".whl"]:
-            python.check_dist(dist / asset.name)
+            python.check_dist(dist / asset.name, check_cmd=pydist_check_cmd)
         elif suffix == ".tgz":
             pass  # already handled
         else:

jupyter_releaser/python.py

@@ -34,10 +34,12 @@ def build_dist(dist_dir, clean=True):
         util.run(f"python setup.py bdist_wheel --dist-dir {dest}", quiet=True)
 
 
-def check_dist(dist_file, test_cmd="", python_imports=None):
+def check_dist(
+    dist_file, test_cmd="", python_imports=None, check_cmd="twine check --strict"
+):
     """Check a Python package locally (not as a cli)"""
     dist_file = util.normalize_path(dist_file)
-    util.run(f"twine check {dist_file}")
+    util.run(f"{check_cmd} {dist_file}")
 
     test_commands = []
 

jupyter_releaser/tests/test_cli.py

@@ -163,6 +163,7 @@ def test_list_envvars(runner):
 output: RH_CHANGELOG_OUTPUT
 post-version-message: RH_POST_VERSION_MESSAGE
 post-version-spec: RH_POST_VERSION_SPEC
+pydist-check-cmd: RH_PYDIST_CHECK_CMD
 python-packages: RH_PYTHON_PACKAGES
 ref: RH_REF
 release-message: RH_RELEASE_MESSAGE