Merge pull request #317 from xylar/strip-rc-from-spack-for-mache-version

Strip off rc, etc. from version used for spack branch names

Author: xylar

conda/meta.yaml

@@ -22,6 +22,7 @@ requirements:
     - importlib_resources
     - jinja2
     - lxml
+    - packaging
     - pyyaml
     - requests
     - rsync

mache/spack/env.py

@@ -3,6 +3,7 @@
 from importlib import resources as importlib_resources
 
 from jinja2 import Template
+from packaging.version import Version
 
 from mache.machine_info import MachineInfo, discover_machine
 from mache.spack.script import get_spack_script
@@ -139,9 +140,13 @@ def make_spack_env(
 
         modules = f'{modules}\nexport TMPDIR={tmpdir}'
 
+    # Use PEP 440 parsing to strip any pre/dev/post release tags and keep only
+    # the base release version (e.g., "1.2.3rc1" -> "1.2.3").
+    version = Version(__version__).base_version
+
     template_args = dict(
         modules=modules,
-        version=__version__,
+        version=version,
         spack_path=spack_path,
         env_name=env_name,
         yaml_filename=yaml_filename,

pyproject.toml

@@ -24,6 +24,7 @@ dependencies = [
     "importlib_resources",
     "jinja2",
     "lxml",
+    "packaging",
     "pyyaml",
     "requests",
     "termcolor",

spec-file.txt

@@ -2,6 +2,7 @@ python >=3.9
 importlib_resources
 jinja2
 lxml
+packaging
 pyyaml
 requests
 rsync