Allow to specify a list of imports

Author: fcollonval

jupyter_releaser/cli.py

@@ -184,12 +184,13 @@ def main(force):
     )
 ]
 
-python_target_options = [
+python_imports_options = [
     click.option(
-        "--python-target",
-        envvar="RH_PYTHON_TARGET",
-        default="",
-        help="The Python package import to check for; default to the Python package name.",
+        "--check-imports",
+        envvar="RH_CHECK_IMPORTS",
+        default=[],
+        multiple=True,
+        help="The Python packages import to check for; default to the Python package name.",
     )
 ]
 
@@ -412,16 +413,16 @@ def build_python(dist_dir, python_packages):
 
 @main.command()
 @add_options(dist_dir_options)
-@add_options(python_target_options)
+@add_options(python_imports_options)
 @use_checkout_dir()
-def check_python(dist_dir, python_target):
+def check_python(dist_dir, python_imports):
     """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
-        test_cmd = f'python -c "import {python_target}"' if python_target else ""
-        python.check_dist(dist_file, test_cmd)
+
+        python.check_dist(dist_file, python_imports=python_imports)
 
 
 @main.command()

jupyter_releaser/python.py

@@ -34,16 +34,22 @@ 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=""):
+def check_dist(dist_file, test_cmd="", python_imports=None):
     """Check a Python package locally (not as a cli)"""
     dist_file = util.normalize_path(dist_file)
     util.run(f"twine check {dist_file}")
 
-    if not test_cmd:
+    test_commands = []
+
+    if test_cmd:
+        test_commands.append(test_cmd)
+    elif python_imports is not None:
+        test_commands.extend([f'python -c "import {name}"' for name in python_imports])
+    else:
         # Get the package name from the dist file name
         name = re.match(r"(\S+)-\d", osp.basename(dist_file)).groups()[0]
         name = name.replace("-", "_")
-        test_cmd = f'python -c "import {name}"'
+        test_commands.append(f'python -c "import {name}"')
 
     # Create venvs to install dist file
     # run the test command in the venv
@@ -60,11 +66,12 @@ def check_dist(dist_file, test_cmd=""):
         util.run(f"{bin_path}/python -m pip install -q -U pip")
         util.run(f"{bin_path}/pip install -q {dist_file}")
         try:
-            util.run(f"{bin_path}/{test_cmd}")
+            for cmd in test_commands:
+                util.run(f"{bin_path}/{cmd}")
         except CalledProcessError as e:
             if test_cmd == "":
                 util.log(
-                    'You may need to set "python_target" to an appropriate Python package name in the config file.'
+                    'You may need to set "check_imports" to appropriate Python package names in the config file.'
                 )
             raise e
 

jupyter_releaser/tests/test_cli.py

@@ -163,7 +163,7 @@ def test_list_envvars(runner):
 post-version-message: RH_POST_VERSION_MESSAGE
 post-version-spec: RH_POST_VERSION_SPEC
 python-packages: RH_PYTHON_PACKAGES
-python-target: RH_PYTHON_TARGET
+check-imports: RH_CHECK_IMPORTS
 ref: RH_REF
 release-message: RH_RELEASE_MESSAGE
 repo: RH_REPOSITORY
@@ -439,7 +439,7 @@ def test_check_python(py_package, runner, build_mock, git_prep):
 def test_check_python_different_names(
     monkeypatch, py_package_different_names, runner, build_mock, git_prep
 ):
-    monkeypatch.setenv("RH_PYTHON_TARGET", "foobar")
+    monkeypatch.setenv("RH_CHECK_IMPORTS", "foobar")
     runner(["build-python"])
     runner(["check-python"])