diff options
author | Juan Miguel Carceller <22276694+jmcarcell@users.noreply.github.com> | 2024-05-10 16:39:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-10 07:39:06 -0700 |
commit | 567566da08c595c770be396fe5e5c0ea79927741 (patch) | |
tree | f077d0e3b4c78bed2782408bedd74ab80c497b6d | |
parent | 30a9ab749da0c7543b4f8b964ceb4cc7b1233044 (diff) | |
download | spack-567566da08c595c770be396fe5e5c0ea79927741.tar.gz spack-567566da08c595c770be396fe5e5c0ea79927741.tar.bz2 spack-567566da08c595c770be396fe5e5c0ea79927741.tar.xz spack-567566da08c595c770be396fe5e5c0ea79927741.zip |
edm4hep: cleanup recipe, remove deprecated versions and patches (#44113)
Co-authored-by: jmcarcell <jmcarcell@users.noreply.github.com>
-rw-r--r-- | var/spack/repos/builtin/packages/edm4hep/package.py | 77 | ||||
-rw-r--r-- | var/spack/repos/builtin/packages/edm4hep/test-deps.patch | 12 |
2 files changed, 3 insertions, 86 deletions
diff --git a/var/spack/repos/builtin/packages/edm4hep/package.py b/var/spack/repos/builtin/packages/edm4hep/package.py index 414eacdca7..7984506e5f 100644 --- a/var/spack/repos/builtin/packages/edm4hep/package.py +++ b/var/spack/repos/builtin/packages/edm4hep/package.py @@ -31,73 +31,6 @@ class Edm4hep(CMakePackage): version("0.10.2", sha256="c22c5c2f0fd1d09da9b734c1fa7ee546675fd2b047406db6ab8266e7657486d2") version("0.10.1", sha256="28a3bd4df899309b14ec0d441f8b6ed0065206a08a0018113bb490e9d008caed") version("0.10", sha256="a95c917c19793cfad6b0959854a653c5ce698c965598cabd649d544da07712c0") - version( - "0.9", - sha256="170ef84822761c4b02da9047f2b4d0dd0f48ed1c027b10171d4207b1542fbd5c", - deprecated=True, - ) - version( - "0.8", - sha256="102d57167885eba3bea79f6b6647e5303ad8732c5784590abdcdd816b2411c79", - deprecated=True, - ) - version( - "0.7.2", - sha256="e289280d5de2c0a3b542bf9dfe04b9f6471b0a0fcf33f5c8101ea7252e2a7643", - deprecated=True, - ) - version( - "0.7.1", - sha256="82e215a532f548a73a6f6094eaa8b436c553994e135f6d63a674543dc89a9f1b", - deprecated=True, - ) - version( - "0.7", - sha256="0cef3f06d86c13e87e3343ac9d5db0b3087c421e8bda4bd2623858acb1af60c9", - deprecated=True, - ) - version( - "0.6", - sha256="625a5a939cb8d7a0a6ab5874a3e076d7dd5338446be3921b0cbc09de4d96b315", - deprecated=True, - ) - version( - "0.5", - sha256="aae4f001412d57585751d858999fe78e004755aa0303a503d503a325ef97d7e0", - deprecated=True, - ) - version( - "0.4.2", - sha256="5f2ff3a14729cbd4da370c7c768c2a09eb9f68f814d61690b1cc99c4248994f4", - deprecated=True, - ) - version( - "0.4.1", - sha256="122987fd5969b0f1639afa9668ac5181203746d00617ddb3bf8a2a9842758a63", - deprecated=True, - ) - version( - "0.4", - sha256="bcb729cd4a6f5917b8f073364fc950788111e178dd16b7e5218361f459c92a24", - deprecated=True, - ) - version( - "0.3.2", - sha256="b6a28649a4ba9ec1c4423bd1397b0a810ca97374305c4856186b506e4c00f769", - deprecated=True, - ) - version( - "0.3.1", - sha256="eeec38fe7d72d2a72f07a63dca0a34ca7203727f67869c0abf6bef014b8b319b", - deprecated=True, - ) - version( - "0.3", - sha256="d0ad8a486c3ed1659ea97d47b268fe56718fdb389b5935f23ba93804e4d5fbc5", - deprecated=True, - ) - - patch("test-deps.patch", when="@:0.3.2") _cxxstd_values = ("17", "20") variant( @@ -113,19 +46,15 @@ class Edm4hep(CMakePackage): depends_on("python", type="build") depends_on("root@6.08:") - depends_on("nlohmann-json@3.10:", when="@0.7.1:") - depends_on("podio@0.15:", when="@0.6:") - depends_on("podio@0.14.1:", when="@0.4.1:") - depends_on("podio@0.14", when="@0.4") - depends_on("podio@0.13.0:0.13", when="@:0.3") + depends_on("nlohmann-json@3.10:") + depends_on("podio@0.15:") for _std in _cxxstd_values: depends_on("podio cxxstd=" + _std, when="cxxstd=" + _std) depends_on("py-jinja2", type="build") depends_on("py-pyyaml", type="build") - depends_on("hepmc@:2", type="test", when="@:0.4.0") - depends_on("hepmc3", type="test", when="@0.4.1:") + depends_on("hepmc3", type="test") depends_on("heppdt", type="test") depends_on("catch2@3.0.1:", type="test") diff --git a/var/spack/repos/builtin/packages/edm4hep/test-deps.patch b/var/spack/repos/builtin/packages/edm4hep/test-deps.patch deleted file mode 100644 index 53d4bddacb..0000000000 --- a/var/spack/repos/builtin/packages/edm4hep/test-deps.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index 6413c03..11325a4 100644 ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -54,6 +54,7 @@ IF(TARGET ROOT::ROOTDataFrame) - add_test(NAME test_rdf COMMAND test_rdf) - set_tests_properties(test_rdf PROPERTIES - ENVIRONMENT LD_LIBRARY_PATH=$<TARGET_FILE_DIR:edm4hep>:$<TARGET_FILE_DIR:podio::podio>:$ENV{LD_LIBRARY_PATH} -+ DEPENDS write_events - ) - endif() - |