Fix entry point loading in >3.9 python for pfb and users

Update test_cli to assert SystemExit 0

Author: k-burt-uch

.github/workflows/ci.yaml

@@ -19,8 +19,10 @@ jobs:
     strategy:
       matrix:
         # the versions for which we require the CI to pass on PRs can
+
         # be updated in the repo settings (branch rules)
         version: ['3.9', '3.10', '3.11', '3.12', '3.13']
       fail-fast: false  # run for all versions even if one of them fails
     with:
         python-version: ${{ matrix.version }}
+        poetry-version: '2.2.1' # Max version supported by python 3.9

gen3/cli/pfb.py

@@ -1,6 +1,9 @@
 import click
+import sys
 from pfb import cli as pfb_cli
 
+from gen3.utils import load_entry_points
+
 try:
     from importlib.metadata import entry_points
 except ImportError:
@@ -22,6 +25,4 @@ def pfb():
 for command in pfb_cli.main.commands:
     pfb.add_command(pfb_cli.main.get_command(ctx=None, cmd_name=command))
 
-# load plug-ins from entry_points
-for ep in entry_points().get("gen3.plugins", []):
-    ep.load()
+load_entry_points()

gen3/cli/users.py

@@ -1,7 +1,9 @@
 import click
 
 from gen3users import main as users_cli
+import sys
 
+from gen3.utils import load_entry_points
 
 try:
     from importlib.metadata import entry_points
@@ -24,6 +26,4 @@ def users():
 for command in users_cli.main.commands:
     users.add_command(users_cli.main.get_command(ctx=None, cmd_name=command))
 
-# load plug-ins from entry_points
-for ep in entry_points().get("gen3.plugins", []):
-    ep.load()
+load_entry_points()

gen3/utils.py

@@ -341,6 +341,23 @@ def deep_dict_update(a, b):
     return a
 
 
+def load_entry_points():
+    try:
+        from importlib.metadata import entry_points
+    except ImportError:
+        from importlib_metadata import entry_points
+
+    # Load plug-ins from entry_points (syntax changes for python 3.12+)
+    major = sys.version_info[0]
+    minor = sys.version_info[1]
+    if major == 3 and minor >= 12:
+        for ep in entry_points(group="pfb.plugins"):
+            ep.load()
+    else:
+        for ep in entry_points().get("pfb.plugins", []):
+            ep.load()
+
+
 # Default settings to control usage of backoff library.
 DEFAULT_BACKOFF_SETTINGS = {
     # Disable backoff lib default logger, only show custom logs

poetry.lock

@@ -30,7 +30,7 @@ importlib_metadata = ">=8,<9"
 jsonschema = "*"
 # FIXME updating to >=0.6.0 breaks a few tests
 dataclasses-json = "<=0.5.9"
-pypfb = ">=0.5.33"
+pypfb = ">=0.6.2"
 tqdm = "^4.61.2"
 humanfriendly ="*"
 python-dateutil = "*"

pyproject.toml

@@ -1,2 +1,9 @@
-def test_import_cli():
-    import gen3.cli.__main__
+import pytest
+
+
+def test_import_cli(monkeypatch):
+    monkeypatch.setattr("sys.argv", ["gen3", "--help"])
+    with pytest.raises(SystemExit) as e:
+        import gen3.cli.__main__
+
+    assert e.value.code == 0