Skip to content
Snippets Groups Projects
Commit ea918327 authored by Yizhou Cai's avatar Yizhou Cai
Browse files

Merge branch 'test_ci' into 'upper_limit_band_with_discrete'

Update CI image to root:6.30.02-alma9

See merge request !234
parents d10c01bd 1fc69079
No related branches found
No related tags found
1 merge request!234Update CI image to root:6.30.02-alma9
Pipeline #11809582 passed
# 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;
......
......@@ -46,7 +46,9 @@ setup(
'matplotlib',
'click',
'pandas',
'tabulate'
'tabulate',
'PyYAML',
'typing_extensions'
],
scripts=['bin/quickstats'],
python_requires='>=3.7',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment