Merge pull request #7301 from cms-sw/correctionlib-200

Updated correctionlib version 2.0.0 and its dependencies

pip/correctionlib.file

@@ -1 +1,3 @@
-Requires: py3-pybind11 py3-numpy py3-pydantic py3-python-rapidjson
+Requires: py3-pybind11 py3-numpy py3-pydantic py3-python-rapidjson py3-rich
+BuildRequires: py3-setuptools-scm py3-scikit-build cmake
+%define PipPreBuildPy export CMAKE_BUILD_PARALLEL_LEVEL=%{compiling_processes}

pip/requirements.txt

@@ -46,7 +46,7 @@ charset-normalizer==2.0.4
 cleo==0.8.1
 clikit==0.6.2
 cmsml==0.1.2
-correctionlib==1.1.0
+correctionlib==2.0.0
 crashtest==0.3.1
 certifi==2021.5.30
 cffi==1.14.6
@@ -55,6 +55,7 @@ Click==8.0.1
 climate==0.4.6
 cloudpickle==1.6.0
 colorama==0.4.4
+commonmark==0.9.1
 conan==1.39.0
 contextlib2==21.6.0
 contextvars==2.4
@@ -246,6 +247,7 @@ requests==2.26.0
 requests-toolbelt==0.9.1
 requests-oauthlib==1.3.0
 requests-unixsocket==0.2.0
+rich==10.9.0
 rootpy==1.0.1
 rsa==4.7.2
 scandir==1.10.0

pip/rich.file

@@ -0,0 +1,2 @@
+BuildRequires: py3-poetry
+Requires: py3-colorama py3-commonmark py3-Pygments

scram-tools.file/tools/py3-correctionlib/correctionlib.xml

@@ -0,0 +1,10 @@
+<tool name="correctionlib" version="@TOOL_VERSION@">
+  <lib name="correctionlib"/>
+  <client>
+    <environment name="CORRECTIONLIB_BASE" default="@TOOL_ROOT@"/>
+    <environment name="INCLUDE" default="$CORRECTIONLIB_BASE/@PYTHON3_LIB_SITE_PACKAGES@/correctionlib/include"/>
+    <environment name="LIBDIR" default="$CORRECTIONLIB_BASE/@PYTHON3_LIB_SITE_PACKAGES@/correctionlib/lib"/>
+    <environment name="BINDIR" default="$CORRECTIONLIB_BASE/bin"/>
+  </client>
+  <runtime name="PATH" default="$BINDIR" type="path"/>
+</tool>