Merge pull request #492 from leowerneck/main

Updated package.py for singularity-eos to avoid spack.* constructs

Author: Yurlungur

CHANGELOG.md

@@ -9,6 +9,7 @@
 - [[PR444]](https://github.com/lanl/singularity-eos/pull/444) Add Z split modifier and electron ideal gas EOS
 
 ### Fixed (Repair bugs, etc)
+- [PR492](https://github.com/lanl/singularity-eos/pull/492) Fix import issue in spack's package.py.
 - [[PR485]](https://github.com/lanl/singularity-eos/pull/485) Fix segfault in Fortran interface related to EOSPAC initialization
 - [[PR478]](https://github.com/lanl/singularity-eos/pull/478) Fix bug in KPT test. Add more extensive clang build to github CI matrix.
 - [[PR473]](https://github.com/lanl/singularity-eos/pull/473) Resolve memory issue. Thanks for the catch, Richard!

spack-repo/packages/singularity-eos/package.py

@@ -4,9 +4,11 @@
 
 import os
 
+from spack import spack_version
 from spack.error import SpackError
 from spack.package import *
 from spack.directives import directive
+from spack.version import Version
 
 
 @directive("singularity_eos_plugins")
@@ -168,7 +170,7 @@ class SingularityEos(CMakePackage, CudaPackage, ROCmPackage):
     depends_on("kokkos +wrapper+cuda_lambda", when="+cuda+kokkos")
 
     # fix for older spacks
-    if spack.version.Version(spack.spack_version) >= spack.version.Version("0.17"):
+    if Version(spack_version) >= Version("0.17"):
         depends_on("kokkos-kernels", when="+kokkos-kernels")
 
     for _flag in list(CudaPackage.cuda_arch_values):