From 25704ae8e6c52947686aa45bc270dc10ac6a41bc Mon Sep 17 00:00:00 2001 From: Thomas Madlener Date: Thu, 14 Oct 2021 15:54:02 +0200 Subject: podio: new version and fix python unittest env (#26649) --- var/spack/repos/builtin/packages/podio/package.py | 3 +++ var/spack/repos/builtin/packages/podio/python-tests.patch | 12 ++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 var/spack/repos/builtin/packages/podio/python-tests.patch diff --git a/var/spack/repos/builtin/packages/podio/package.py b/var/spack/repos/builtin/packages/podio/package.py index 2ac8899537..2368aab333 100644 --- a/var/spack/repos/builtin/packages/podio/package.py +++ b/var/spack/repos/builtin/packages/podio/package.py @@ -17,6 +17,8 @@ class Podio(CMakePackage): tags = ["hep", "key4hep"] version('master', branch='master') + version('0.14', sha256='47f99f1190dc71d6deb52a2b1831250515dbd5c9e0f263c3c8553ffc5b260dfb') + version('0.13.2', sha256='645f6915ca6f34789157c0a9dc8b0e9ec901e019b96eb8a68fb39011602e92eb') version('0.13.1', sha256='2ae561c2a0e46c44245aa2098772374ad246c9fcb1956875c95c69c963501353') version('0.13', sha256='e9cbd4e25730003d3706ad82e28b15cb5bdc524a78b0a26e90b89ea852101498') version('0.12', sha256='1729a2ce21e8b307fc37dfb9a9f5ae031e9f4be4992385cf99dba3e5fdf5323a') @@ -32,6 +34,7 @@ class Podio(CMakePackage): # cpack config throws an error on some systems patch('cpack.patch', when="@:0.10.0") patch('dictloading.patch', when="@0.10.0") + patch('python-tests.patch', when='@:0.14.0') depends_on('root@6.08.06: cxxstd=17') diff --git a/var/spack/repos/builtin/packages/podio/python-tests.patch b/var/spack/repos/builtin/packages/podio/python-tests.patch new file mode 100644 index 0000000000..06d14c6e61 --- /dev/null +++ b/var/spack/repos/builtin/packages/podio/python-tests.patch @@ -0,0 +1,12 @@ +index 5b6e13e..ac9ccf5 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -106,7 +106,7 @@ endif() + add_test( NAME pyunittest COMMAND python -m unittest discover -s ${CMAKE_SOURCE_DIR}/python) + set_property(TEST pyunittest + PROPERTY ENVIRONMENT +- LD_LIBRARY_PATH=${CMAKE_CURRENT_BINARY_DIR}:${CMAKE_BINARY_DIR}/src:$ENV{LD_LIBRARY_PATH} ++ LD_LIBRARY_PATH=${CMAKE_CURRENT_BINARY_DIR}:${CMAKE_BINARY_DIR}/src:$ + PYTHONPATH=${CMAKE_SOURCE_DIR}/python:$ENV{PYTHONPATH} + ROOT_INCLUDE_PATH=${CMAKE_SOURCE_DIR}/tests/datamodel:${ROOT_INCLUDE_PATH}) + set_property(TEST pyunittest PROPERTY DEPENDS write) -- cgit v1.2.3-70-g09d2