diff --git a/packages/ilcsoft/package.py b/packages/ilcsoft/package.py index 0e88f323..bd0b53ba 100644 --- a/packages/ilcsoft/package.py +++ b/packages/ilcsoft/package.py @@ -47,7 +47,6 @@ class Ilcsoft(BundlePackage, Key4hepPackage): # todo: figure out the api for the whizard gitlab instance # depends_on('whizard@master +lcio +openloops hepmc=2', when="@master") - depends_on("k4lcioreader") depends_on("k4simdelphes") depends_on("delphes") diff --git a/packages/k4lcioreader/package.py b/packages/k4lcioreader/package.py deleted file mode 100644 index 7ab2849b..00000000 --- a/packages/k4lcioreader/package.py +++ /dev/null @@ -1,58 +0,0 @@ -from spack.pkg.k4.key4hep_stack import Key4hepPackage - - -class K4lcioreader(CMakePackage, Key4hepPackage): - """LCIO reader based on PODIO and EDM4hep""" - - homepage = "https://github.com/key4hep/k4LCIOReader" - url = "https://github.com/key4hep/k4LCIOReader/archive/v0.1.0.tar.gz" - git = "https://github.com/key4hep/k4LCIOReader.git" - - maintainers = ["mirguest"] - - version("master", branch="master") - version( - "0.5", - sha256="bdd97befeba4caa3ee2fcaea99a1f3b8cc2cb53dedf8e11f3c23a0b9f012b7f7", - url="https://github.com/key4hep/k4LCIOReader/archive/refs/tags/v00.05.tar.gz", - ) - version( - "0.4.3", - sha256="58e7cf2f47b71e0645ff90b24b6746561a6993377ef752901cd901a6cf8fe643", - url="https://github.com/key4hep/k4LCIOReader/archive/refs/tags/v00.04.03.tar.gz", - ) - version( - "0.4.2", - sha256="2bb8383d95b973676b87b4c8af00fdbd8bb84c2d4e45cacf98490d1946f909b0", - url="https://github.com/key4hep/k4LCIOReader/archive/refs/tags/v00.04.02.tar.gz", - ) - version( - "0.4.1", - sha256="bb93892bb38d4bb3176706f1fc55da8a21742a6fe7d5571914e9cfbc3478a847", - url="https://github.com/key4hep/k4LCIOReader/archive/refs/tags/v00.04.01.tar.gz", - ) - version( - "0.4.0", - sha256="aa1f2bcfabc5b5e3a09cab5408af1402b8a4ddf0927f2f69e62084f568306174", - ) - - patch( - "https://github.com/key4hep/k4LCIOReader/commit/81f4f47ecc7ce904189986e08b949d477c0e4f08.patch", - sha256="5c88414128ccc9af6b53669f79ac5e4a61c4841d7de5b00a56400c9e92b7d37d", - when="@0.4.1", - ) - - depends_on("lcio") - depends_on("podio@0.12:") - depends_on("edm4hep") - depends_on("edm4hep@0.5:", when="@0.4.2:") - depends_on("edm4hep@0.8:", when="@0.5:") - depends_on("k4fwcore@0.3.0:", when="@0.4:") - depends_on("root") - - def cmake_args(self): - args = [] - args.append( - "-DCMAKE_CXX_STANDARD=%s" % self.spec["root"].variants["cxxstd"].value - ) - return args diff --git a/packages/k4marlinwrapper/package.py b/packages/k4marlinwrapper/package.py index 3d31ce68..dc7c468b 100644 --- a/packages/k4marlinwrapper/package.py +++ b/packages/k4marlinwrapper/package.py @@ -17,34 +17,7 @@ class K4marlinwrapper(CMakePackage, Ilcsoftpackage): version("master", branch="master") version( - "0.6", sha256="8f276fe5246c12e3ccf460a03a5621a129f172a5047cf7321957f1eeb807f821" - ) - version( - "0.5", sha256="080f86700fd141b288878688a5c8f14fe48f1247a4fa1ce37147f528484e826a" - ) - version( - "0.4.2", - sha256="8ec51ba4e0348d67377179e9d3e9043267a42a0d360d884c331ce52c51b61b03", - ) - version( - "0.4.1", - sha256="7e3c76bd21a2f2bea196fcae270e29e26ed2abc8d70a4c3d37ce88bacbd22528", - ) - version( - "0.4", sha256="6609dacb158f8fd2f8532e0881b0acb73ea23f31578eab44085876a8a59a5946" - ) - version( - "0.3.1", - sha256="a8ef66f6500b9a709b950cdfd3bcb0c775d7fa42336b2aa5c80e2efef7c95b19", - ) - version( - "0.3", sha256="381fd96e2ede03bec048afaeef13b8efffe80030fc097fe18fae62b03c0fba94" - ) - - patch( - "https://patch-diff.githubusercontent.com/raw/key4hep/k4MarlinWrapper/pull/81.diff", - sha256="86348f9e346decb70e88fc0aa071630b97b155660314a01eed3e44e447d00d10", - when="@0.4.1", + "0.7", sha256="aff49b9885d3c5e0804d5bcd3752ac77f3e3bbce6910fa9277252b907656914a" ) depends_on("root") @@ -53,12 +26,8 @@ class K4marlinwrapper(CMakePackage, Ilcsoftpackage): depends_on("gaudi@35.0:") depends_on("k4fwcore") depends_on("edm4hep") - depends_on("edm4hep@0.4.1:", when="@0.4.1:") - depends_on("edm4hep@0.8:", when="@0.6:") - depends_on("k4lcioreader") - depends_on("k4edm4hep2lcioconv", when="@0.4.2:") - depends_on("wget", type=("test")) - depends_on("catch2@3.0.1:", when="@0.3.2:", type=("test")) + depends_on("edm4hep@0.10:1") + depends_on("k4edm4hep2lcioconv") # for the doctest: depends_on("py-jupytext", type=("test")) depends_on("py-ipykernel", type=("test")) diff --git a/packages/key4hep-stack/package.py b/packages/key4hep-stack/package.py index 642e15dd..1bdef1f8 100644 --- a/packages/key4hep-stack/package.py +++ b/packages/key4hep-stack/package.py @@ -66,7 +66,6 @@ class Key4hepStack(BundlePackage, Key4hepPackage): depends_on("k4edm4hep2lcioconv") depends_on("k4fwcore") depends_on("k4gen") - depends_on("k4lcioreader") depends_on("k4projecttemplate") depends_on("k4simdelphes") depends_on("k4simgeant4") diff --git a/scripts/fetch_nightly_versions.py b/scripts/fetch_nightly_versions.py index 8eae3779..0c396431 100755 --- a/scripts/fetch_nightly_versions.py +++ b/scripts/fetch_nightly_versions.py @@ -80,7 +80,6 @@ def add_latest_commit( add_latest_commit("fccdetectors", "hep-fcc/fccdetectors", date=date) add_latest_commit("k4reccalorimeter", "hep-fcc/k4reccalorimeter", date=date) add_latest_commit("cepcsw", "cepc/cepcsw", date=date) - add_latest_commit("k4lcioreader", "key4hep/k4LCIOReader", date=date) add_latest_commit("aidatt", "aidasoft/aidatt", date=date) add_latest_commit("cedviewer", "ilcsoft/cedviewer", date=date) add_latest_commit("conformaltracking", "ilcsoft/conformaltracking", date=date)