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

Jump to bottom

Updated correctionlib version 2.0.0 and its dependencies #7301

Merged
merged 4 commits into from
Sep 14, 2021
Merged

Updated correctionlib version 2.0.0 and its dependencies #7301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
16d4b92
added py3-rich
smuzaffar Sep 13, 2021
009c33c
Updated correctionlib version 2.0.0 and its dependencies
smuzaffar Sep 13, 2021
a228e35
added correctionlib.xml scram toolfile
smuzaffar Sep 13, 2021
7a2b42a
typo
smuzaffar Sep 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion pip/correctionlib.file
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}
4 changes: 3 additions & 1 deletion pip/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions pip/rich.file
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
BuildRequires: py3-poetry
Requires: py3-colorama py3-commonmark py3-Pygments
10 changes: 10 additions & 0 deletions scram-tools.file/tools/py3-correctionlib/correctionlib.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>