From 112a64bdbe358b476d93c7a346daea66eecb105f Mon Sep 17 00:00:00 2001 From: akraut <ari.karl.kraut@cern.ch> Date: Mon, 26 Oct 2020 15:33:10 +0100 Subject: [PATCH 1/2] added docopt package and new stomp.py version --- cmake/toolchain/heptools-dev-base.cmake | 3 ++- pyexternals/CMakeLists.txt | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/cmake/toolchain/heptools-dev-base.cmake b/cmake/toolchain/heptools-dev-base.cmake index 89e18a987f..be05f58d66 100644 --- a/cmake/toolchain/heptools-dev-base.cmake +++ b/cmake/toolchain/heptools-dev-base.cmake @@ -52,6 +52,7 @@ if(LCG_PYTHON_VERSION EQUAL 3) LCG_external_package(jupyterlab_server 1.0.6 ) LCG_external_package(scikitlearn 0.21.2 ) LCG_external_package(scipy 1.5.1 ) + LCG_external_package(stomppy 6.1.0 ) LCG_External_package(more_itertools 7.0.0 ) LCG_External_package(upandas 0.2.0 ) LCG_external_package(numpy 1.18.2 ) @@ -91,6 +92,7 @@ else() LCG_external_package(jupyter_console 5.2.0 ) LCG_external_package(scikitlearn 0.20.3 ) LCG_external_package(scipy 1.2.2 ) + LCG_external_package(stomppy 3.1.3 ) LCG_External_package(more_itertools 5.0.0 ) if(NOT ${LCG_OS}${LCG_OSVERS} MATCHES ubuntu18|mac[0-9]+) LCG_external_package(pygsi 0.6.3 ) @@ -547,7 +549,6 @@ LCG_external_package(spdlog 1.5.0 LCG_external_package(sqlalchemy 1.2.10 ) LCG_external_package(sqlite 3320300 ) LCG_external_package(statsmodels 0.10.2 ) -LCG_external_package(stomppy 3.1.3 ) LCG_external_package(storm 0.23 ) LCG_external_package(swig 4.0.2 ) LCG_external_package(sympy 1.4 ) diff --git a/pyexternals/CMakeLists.txt b/pyexternals/CMakeLists.txt index 511bc29338..fde10a37e2 100644 --- a/pyexternals/CMakeLists.txt +++ b/pyexternals/CMakeLists.txt @@ -1532,6 +1532,19 @@ LCGPackage_Add( DEPENDS Python setuptools ) +#---docopt------------------------------------------------------------------------------------------------------ +LCGPackage_Add( + docopt + URL ${GenURL}/docopt-${docopt_native_version}.tar.gz + CONFIGURE_COMMAND <VOID> + BUILD_COMMAND <VOID> + INSTALL_COMMAND ${MakeSitePackagesDir} + COMMAND ${PYTHON} setup.py install ${PySetupOptions} + COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh <INSTALL_DIR> + BUILD_IN_SOURCE 1 + DEPENDS Python setuptools +) + #---stomppy------------------------------------------------------------------------------------------------------ LCGPackage_Add( stomppy -- GitLab From b628bafa01b1e19454c7842605332b1fd51deea0 Mon Sep 17 00:00:00 2001 From: Ari Kraut <ari.karl.kraut@cern.ch> Date: Mon, 26 Oct 2020 14:47:09 +0000 Subject: [PATCH 2/2] Update heptools-dev-base.cmake added docopt --- cmake/toolchain/heptools-dev-base.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/toolchain/heptools-dev-base.cmake b/cmake/toolchain/heptools-dev-base.cmake index be05f58d66..afec9aaf5e 100644 --- a/cmake/toolchain/heptools-dev-base.cmake +++ b/cmake/toolchain/heptools-dev-base.cmake @@ -13,6 +13,7 @@ if(LCG_PYTHON_VERSION EQUAL 3) LCG_external_package(astroid 2.3.3 ) LCG_external_package(bcrypt 3.1.6 ) LCG_external_package(control 0.8.2 ) + LCG_external_package(docopt 0.6.2 ) LCG_external_package(hepdata_converter 0.2.3 ) LCG_external_package(hypothesis 5.3.0 ) LCG_external_package(ipython 7.5.0 ) -- GitLab