Resolve packaging error (#491)

* Resolve missing top-level scico package * Improve version number construction function
lanl · Dec 22, 2023 · 85c1a1c · 85c1a1c
1 parent 6fe11c7
commit 85c1a1c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/scico/_version.py b/scico/_version.py
@@ -96,7 +96,8 @@ def package_version(split: bool = False) -> Union[str, Tuple[str, str]]:  # prag
         Package version string or tuple of strings.
     """
     version = init_variable_assign_value("__version_")
-    if re.match(r"^[0-9\.]+$", version):  # don't extend purely numeric version numbers
+    # don't extend purely numeric version numbers, possibly ending with post<n>
+    if re.match(r"^[0-9\.]+(post[0-9]+)?$", version):
         git_hash = None
     else:
         git_hash = current_git_hash()

diff --git a/setup.py b/setup.py
@@ -22,7 +22,7 @@
 version = package_version()
 # Add argument exclude=["test", "test.*"] to exclude test subpackage
 packages = find_namespace_packages(where="scico")
-packages = [f"scico.{m}" for m in packages]
+packages = ["scico"] + [f"scico.{m}" for m in packages]
 
 
 longdesc = """