Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add the latest tag for k4MarlinWrapper with correct depenencies for k4EDM4hep2LCIOConv #654

Merged
merged 5 commits into from
Sep 29, 2024
Merged

Add the latest tag for k4MarlinWrapper with correct depenencies for k4EDM4hep2LCIOConv #654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6101c66
Add latest tag and dependency for k4MarlinWrapper
tmadlener Sep 25, 2024
2fe2026
Update LCIO and EDM4hep dependencies for k4EDM4hep2LCIOConv
tmadlener Sep 25, 2024
6ea1886
Mark all but the current version as deprecated
tmadlener Sep 25, 2024
1a0d80f
Use correct version format
tmadlener Sep 25, 2024
9530f1e
Also correct podio dependency
tmadlener Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions packages/k4edm4hep2lcioconv/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,43 +25,54 @@ class K4edm4hep2lcioconv(CMakePackage, Key4hepPackage):
version(
"00-08-02",
sha256="a0418b5c3c6ce77435bd942279420b0390099f417a7984227cf212710b079321",
deprecated=True,
)
version(
"00-08-01",
sha256="4518e39a0c87182d394f213074344ed29724005cd0481a2555a1fe48fdb98d2b",
deprecated=True,
)
version(
"00-08",
sha256="e3bfcb611b78d8e457d7f68e25d5aabe21b4b87928b0de0fc61a09734c7adb4c",
deprecated=True,
)
version(
"00-07",
sha256="269d14c390f987fb3fdb0d2e952febfb639415bef50e5e1c8992f23e0cd4a5a6",
deprecated=True,
)
version(
"00-06",
sha256="c220604577d309bc11a5a4c147f55640fedef90375d1232439343362607a3906",
deprecated=True,
)
version(
"00-05",
sha256="6d352bacff6a16f8d2643cdb108794d02889c38b119442c3c260f9a75cb63e7a",
deprecated=True,
)
version(
"00-04",
sha256="1b6db84f42a1d6e2e5a02cecbc01a0282081b7270a523f201fad4d39f78ca015",
deprecated=True,
)
version(
"00-03",
sha256="0b7fffbe1a07aae4b5b7523e855e944fe90f6e072dae9a460a07134025bf1cf8",
deprecated=True,
)

depends_on("lcio")
depends_on("[email protected]:", when="@00-05:")
depends_on("[email protected]:", when="@00-08:")
depends_on("[email protected]:", when="@00-09:")
depends_on("podio")
tmadlener marked this conversation as resolved.
Show resolved Hide resolved
depends_on("podio@1:", when="@00-09:")
depends_on("[email protected]:", when="@00-03")
depends_on("[email protected]:", when="@00-04:")
depends_on("[email protected]:", when="@00-05:")
depends_on("[email protected]:", when="@00-09:")

def cmake_args(self):
args = [
Expand Down
12 changes: 10 additions & 2 deletions packages/k4marlinwrapper/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,17 @@ class K4marlinwrapper(CMakePackage, Ilcsoftpackage):

version("main", branch="main")
version(
"0.8", sha256="0c624d5719cd055dfc27a9954cdf5e501e6478a2a8baac3bf80da7063e58e6ed"
"0.9", sha256="a0c01e6137cd5bb0794d79433831644dfd5108c763e436428117cd6f4a826ce2"
)
version(
"0.7", sha256="aff49b9885d3c5e0804d5bcd3752ac77f3e3bbce6910fa9277252b907656914a"
"0.8",
sha256="0c624d5719cd055dfc27a9954cdf5e501e6478a2a8baac3bf80da7063e58e6ed",
deprecated=True,
)
version(
"0.7",
sha256="aff49b9885d3c5e0804d5bcd3752ac77f3e3bbce6910fa9277252b907656914a",
deprecated=True,
)

depends_on("root")
Expand All @@ -32,6 +39,7 @@ class K4marlinwrapper(CMakePackage, Ilcsoftpackage):
depends_on("edm4hep")
depends_on("[email protected]:")
depends_on("k4edm4hep2lcioconv")
depends_on("k4edm4hep2lcioconv@00-09:", when="@0.9:")
# for the doctest:
depends_on("py-jupytext", type=("test"))
depends_on("py-ipykernel", type=("test"))
Expand Down
Loading