From 2d61d3f14a388e9f19d81233c2a8d5d59373f8d9 Mon Sep 17 00:00:00 2001 From: Dmitri Konstantinov <Dmitri.Konstantinov@cern.ch> Date: Tue, 17 Dec 2024 13:03:57 +0100 Subject: [PATCH] Add pyeda-0.29.0 patch, recipe and pyeda-0.29.0 to 105c_LHCB_8 --- cmake/toolchain/heptools-105c_LHCB_8.cmake | 3 +++ pyexternals/CMakeLists.txt | 15 +++++++++++++++ pyexternals/patches/pyeda-0.29.0.patch | 6 ++++++ 3 files changed, 24 insertions(+) create mode 100644 pyexternals/patches/pyeda-0.29.0.patch diff --git a/cmake/toolchain/heptools-105c_LHCB_8.cmake b/cmake/toolchain/heptools-105c_LHCB_8.cmake index 9e1a0dac0d..57fd4802bd 100644 --- a/cmake/toolchain/heptools-105c_LHCB_8.cmake +++ b/cmake/toolchain/heptools-105c_LHCB_8.cmake @@ -36,6 +36,9 @@ LCG_external_package(yoda 1.9.10 ${MCGENPATH}/yoda) LCG_external_package(thepeg 2.2.3 ${MCGENPATH}/thepeg hepmc=2) LCG_external_package(herwig3 7.2.3p2 ${MCGENPATH}/herwig++ thepeg=2.2.3 madgraph=2.9.3.atlas1 openloops=2.1.1 lhapdf=6.2.3 author=7.2.3 hepmc=2) +LCG_external_package(pyeda 0.29.0 ) + LIST(APPEND LHCB_TOP_PACKAGES superchic) +LIST(APPEND LHCB_TOP_PACKAGES pyeda) LCG_top_packages(${LHCB_TOP_PACKAGES}) diff --git a/pyexternals/CMakeLists.txt b/pyexternals/CMakeLists.txt index 166d7dae84..b159cd168a 100644 --- a/pyexternals/CMakeLists.txt +++ b/pyexternals/CMakeLists.txt @@ -8200,3 +8200,18 @@ LCGPackage_Add( BUILD_IN_SOURCE 1 DEPENDS Python pip asteval uncertainties numpy scipy ) + +#---pyeda-------------------------------------------------------------------- +LCGPackage_Add( + pyeda + URL ${GenURL}/pyeda-<VERSION>.tar.gz + CONFIGURE_COMMAND <VOID> + BUILD_COMMAND <VOID> + INSTALL_COMMAND ${MakeSitePackagesDir} + COMMAND ${PYTHON} -m pip install ${PySetupOptions} --no-deps . + COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh <INSTALL_DIR> + BUILD_IN_SOURCE 1 + DEPENDS Python pip +) + + diff --git a/pyexternals/patches/pyeda-0.29.0.patch b/pyexternals/patches/pyeda-0.29.0.patch new file mode 100644 index 0000000000..e5aa0cab1a --- /dev/null +++ b/pyexternals/patches/pyeda-0.29.0.patch @@ -0,0 +1,6 @@ +--- setup.py~ 2023-11-19 18:33:30.000000000 +0100 ++++ setup.py 2024-07-24 13:13:45.018399166 +0200 +@@ -189,1 +189,1 @@ +- Extension("pyeda.boolalg.espresso", **ESPRESSO), ++ Extension("pyeda.boolalg.espresso", **ESPRESSO, extra_compile_args=["-Wno-incompatible-pointer-types"]), + -- GitLab