Skip to content

Commit

Permalink
Remove k4lcioreader from stack (#541)
Browse files Browse the repository at this point in the history
  • Loading branch information
tmadlener authored Nov 13, 2023
1 parent 600ea5c commit d3b1dda
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 95 deletions.
1 change: 0 additions & 1 deletion packages/ilcsoft/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
58 changes: 0 additions & 58 deletions packages/k4lcioreader/package.py

This file was deleted.

37 changes: 3 additions & 34 deletions packages/k4marlinwrapper/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -53,12 +26,8 @@ class K4marlinwrapper(CMakePackage, Ilcsoftpackage):
depends_on("[email protected]:")
depends_on("k4fwcore")
depends_on("edm4hep")
depends_on("[email protected]:", when="@0.4.1:")
depends_on("[email protected]:", when="@0.6:")
depends_on("k4lcioreader")
depends_on("k4edm4hep2lcioconv", when="@0.4.2:")
depends_on("wget", type=("test"))
depends_on("[email protected]:", when="@0.3.2:", type=("test"))
depends_on("[email protected]:1")
depends_on("k4edm4hep2lcioconv")
# for the doctest:
depends_on("py-jupytext", type=("test"))
depends_on("py-ipykernel", type=("test"))
Expand Down
1 change: 0 additions & 1 deletion packages/key4hep-stack/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
1 change: 0 additions & 1 deletion scripts/fetch_nightly_versions.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit d3b1dda

Please sign in to comment.