@@ -88,6 +88,7 @@ <h1>Source code for mache.spack.env</h1><div class="highlight"><pre>
8888< span class ="kn "> from</ span > < span class ="w "> </ span > < span class ="nn "> importlib</ span > < span class ="w "> </ span > < span class ="kn "> import</ span > < span class ="n "> resources</ span > < span class ="k "> as</ span > < span class ="n "> importlib_resources</ span >
8989
9090< span class ="kn "> from</ span > < span class ="w "> </ span > < span class ="nn "> jinja2</ span > < span class ="w "> </ span > < span class ="kn "> import</ span > < span class ="n "> Template</ span >
91+ < span class ="kn "> from</ span > < span class ="w "> </ span > < span class ="nn "> packaging.version</ span > < span class ="w "> </ span > < span class ="kn "> import</ span > < span class ="n "> Version</ span >
9192
9293< span class ="kn "> from</ span > < span class ="w "> </ span > < span class ="nn "> mache.machine_info</ span > < span class ="w "> </ span > < span class ="kn "> import</ span > < span class ="n "> MachineInfo</ span > < span class ="p "> ,</ span > < span class ="n "> discover_machine</ span >
9394< span class ="kn "> from</ span > < span class ="w "> </ span > < span class ="nn "> mache.spack.script</ span > < span class ="w "> </ span > < span class ="kn "> import</ span > < span class ="n "> get_spack_script</ span >
@@ -226,9 +227,13 @@ <h1>Source code for mache.spack.env</h1><div class="highlight"><pre>
226227
227228 < span class ="n "> modules</ span > < span class ="o "> =</ span > < span class ="sa "> f</ span > < span class ="s1 "> '</ span > < span class ="si "> {</ span > < span class ="n "> modules</ span > < span class ="si "> }</ span > < span class ="se "> \n</ span > < span class ="s1 "> export TMPDIR=</ span > < span class ="si "> {</ span > < span class ="n "> tmpdir</ span > < span class ="si "> }</ span > < span class ="s1 "> '</ span >
228229
230+ < span class ="c1 "> # Use PEP 440 parsing to strip any pre/dev/post release tags and keep only</ span >
231+ < span class ="c1 "> # the base release version (e.g., "1.2.3rc1" -> "1.2.3").</ span >
232+ < span class ="n "> version</ span > < span class ="o "> =</ span > < span class ="n "> Version</ span > < span class ="p "> (</ span > < span class ="n "> __version__</ span > < span class ="p "> )</ span > < span class ="o "> .</ span > < span class ="n "> base_version</ span >
233+
229234 < span class ="n "> template_args</ span > < span class ="o "> =</ span > < span class ="nb "> dict</ span > < span class ="p "> (</ span >
230235 < span class ="n "> modules</ span > < span class ="o "> =</ span > < span class ="n "> modules</ span > < span class ="p "> ,</ span >
231- < span class ="n "> version</ span > < span class ="o "> =</ span > < span class ="n "> __version__ </ span > < span class ="p "> ,</ span >
236+ < span class ="n "> version</ span > < span class ="o "> =</ span > < span class ="n "> version </ span > < span class ="p "> ,</ span >
232237 < span class ="n "> spack_path</ span > < span class ="o "> =</ span > < span class ="n "> spack_path</ span > < span class ="p "> ,</ span >
233238 < span class ="n "> env_name</ span > < span class ="o "> =</ span > < span class ="n "> env_name</ span > < span class ="p "> ,</ span >
234239 < span class ="n "> yaml_filename</ span > < span class ="o "> =</ span > < span class ="n "> yaml_filename</ span > < span class ="p "> ,</ span >
0 commit comments