Improve get_version method

Author: ctrueden

src/scyjava/_versions.py

@@ -15,8 +15,8 @@ def get_version(java_class_or_python_package) -> str:
     """
     Return the version of a Java class or Python package.
 
-    For Python package, uses importlib.metadata.version if available
-    (Python 3.8+), with pkg_resources.get_distribution as a fallback.
+    For Python packages, invokes importlib.metadata.version on the given
+    object's base __module__ or __package__ (before the first dot symbol).
 
     For Java classes, requires org.scijava:scijava-common on the classpath.
 
@@ -32,8 +32,16 @@ def get_version(java_class_or_python_package) -> str:
         VersionUtils = jimport("org.scijava.util.VersionUtils")
         return str(VersionUtils.getVersion(java_class_or_python_package))
 
-    # Assume we were given a Python package name.
-    return version(java_class_or_python_package)
+    # Assume we were given a Python package name or module.
+    package_name = None
+    if hasattr(java_class_or_python_package, "__module__"):
+        package_name = java_class_or_python_package.__module__
+    elif hasattr(java_class_or_python_package, "__package__"):
+        package_name = java_class_or_python_package.__package__
+    else:
+        package_name = str(java_class_or_python_package)
+
+    return version(package_name.split(".")[0])
 
 
 def is_version_at_least(actual_version: str, minimum_version: str) -> bool:

tests/test_versions.py

@@ -2,6 +2,7 @@
 Tests for functions in _versions submodule.
 """
 
+from importlib.metadata import version
 from pathlib import Path
 
 import toml
@@ -18,8 +19,18 @@ def _expected_version():
 
 
 def test_version():
-    # First, ensure that the version is correct
-    assert _expected_version() == scyjava.__version__
+    sjver = _expected_version()
 
-    # Then, ensure that we get the correct version via get_version
-    assert _expected_version() == scyjava.get_version("scyjava")
+    # First, ensure that the version is correct.
+    assert sjver == scyjava.__version__
+
+    # Then, ensure that we get the correct version via get_version.
+    assert sjver == scyjava.get_version("scyjava")
+    assert sjver == scyjava.get_version(scyjava)
+    assert sjver == scyjava.get_version("scyjava.config")
+    assert sjver == scyjava.get_version(scyjava.config)
+    assert sjver == scyjava.get_version(scyjava.config.mode)
+    assert sjver == scyjava.get_version(scyjava.config.Mode)
+
+    # And that we get the correct version of other things, too.
+    assert version("toml") == scyjava.get_version(toml)