diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 470c29136fe6ba71677548845d792d7533f60cd5..b9bd82c467d2e098afde79d4ced19df027c2d1f5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ # Taken from https://hub.docker.com/r/rootproject/root -image: rootproject/root:6.30.02-conda +image: rootproject/root:6.30.02-alma9 stages: - run @@ -17,8 +17,9 @@ cache: before_script: - set +e - export PATH=${HOME}/.local/bin/:$PATH + - dnf install xrootd-client xrootd-server python3-xrootd -y - pip install --user . - - python -c 'import quickstats as q; print(q.__version__)' + - python3 -c 'import quickstats as q; print(q.__version__)' fit_bbyy: stage: run @@ -63,6 +64,7 @@ compare_bbyy: file3: limits_summary.json file4: kl.json script: + - dnf install diffutils -y - sed -i '/total_time/d' .ci/bbyy/$file1 output_ci_bbyy/$file1 - diff .ci/bbyy/$file1 output_ci_bbyy/$file1 - if [[ $? -ne 0 ]]; then echo "$file1 not equal"; exit 1; else echo "$file1 equal"; fi; @@ -84,6 +86,7 @@ compare_bbtautau: file3: limits_summary.json file4: kl.json script: + - dnf install diffutils -y - sed -i '/total_time/d' .ci/bbtautau/$file1 output_ci_bbtautau/$file1 - diff .ci/bbtautau/$file1 output_ci_bbtautau/$file1 - if [[ $? -ne 0 ]]; then echo "$file1 not equal"; exit 1; else echo "$file1 equal"; fi; diff --git a/setup.py b/setup.py index 554cbb7d725e76309d34a37d25753a25a701a89e..0dfa720feceac1533536b200470c02f644866612 100644 --- a/setup.py +++ b/setup.py @@ -46,7 +46,9 @@ setup( 'matplotlib', 'click', 'pandas', - 'tabulate' + 'tabulate', + 'PyYAML', + 'typing_extensions' ], scripts=['bin/quickstats'], python_requires='>=3.7',