From 05f54b10a12d812a5b307d2aa950dabb80e19f53 Mon Sep 17 00:00:00 2001
From: Yizhou Cai <yizhou.cai@cern.ch>
Date: Fri, 18 Apr 2025 18:09:20 +0800
Subject: [PATCH 1/7] test ci
---
.gitlab-ci.yml | 3 ++-
setup.py | 4 +++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 470c2913..acdde161 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,6 +17,7 @@ cache:
before_script:
- set +e
- export PATH=${HOME}/.local/bin/:$PATH
+ - dnf install xrootd-client xrootd-server python3-xrootd
- pip install --user .
- python -c 'import quickstats as q; print(q.__version__)'
diff --git a/setup.py b/setup.py
index 554cbb7d..0dfa720f 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',
--
GitLab
From 4effa3c75d283a824b9888d2304438165d30f08c Mon Sep 17 00:00:00 2001
From: Yizhou Cai <yizhou.cai@cern.ch>
Date: Fri, 18 Apr 2025 18:11:00 +0800
Subject: [PATCH 2/7] test ci
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index acdde161..25ba5132 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ cache:
before_script:
- set +e
- export PATH=${HOME}/.local/bin/:$PATH
- - dnf install xrootd-client xrootd-server python3-xrootd
+ - dnf install xrootd-client xrootd-server python3-xrootd -y
- pip install --user .
- python -c 'import quickstats as q; print(q.__version__)'
--
GitLab
From 28e99a9023645e8ac812b9970a4beda66732da4f Mon Sep 17 00:00:00 2001
From: Yizhou Cai <yizhou.cai@cern.ch>
Date: Fri, 18 Apr 2025 18:19:49 +0800
Subject: [PATCH 3/7] test ci
---
.gitlab-ci.yml | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 25ba5132..313ed6ad 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-alma9
+image: rootproject/root:6.30.06-ubuntu22.04
stages:
- run
@@ -17,9 +17,10 @@ cache:
before_script:
- set +e
- export PATH=${HOME}/.local/bin/:$PATH
- - dnf install xrootd-client xrootd-server python3-xrootd -y
+ - apt install xrootd-client xrootd-server python3-xrootd -y
+ - apt install diffutils -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
--
GitLab
From d3a6d4eefa87515e665ef38a14851c67bf1f4643 Mon Sep 17 00:00:00 2001
From: Yizhou Cai <yizhou.cai@cern.ch>
Date: Fri, 18 Apr 2025 18:23:01 +0800
Subject: [PATCH 4/7] test ci
---
.gitlab-ci.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 313ed6ad..714e9275 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,9 +17,10 @@ cache:
before_script:
- set +e
- export PATH=${HOME}/.local/bin/:$PATH
+ - apt update
- apt install xrootd-client xrootd-server python3-xrootd -y
- apt install diffutils -y
- - pip install --user .
+ - pip3 install --user .
- python3 -c 'import quickstats as q; print(q.__version__)'
fit_bbyy:
--
GitLab
From 8b9aed455a98490bcb9d9fbf0846892e052acf5b Mon Sep 17 00:00:00 2001
From: Yizhou Cai <yizhou.cai@cern.ch>
Date: Fri, 18 Apr 2025 18:25:07 +0800
Subject: [PATCH 5/7] test ci
---
.gitlab-ci.yml | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 714e9275..8301ef5f 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.06-ubuntu22.04
+image: rootproject/root:6.30.02-alma9
stages:
- run
@@ -17,10 +17,9 @@ cache:
before_script:
- set +e
- export PATH=${HOME}/.local/bin/:$PATH
- - apt update
- - apt install xrootd-client xrootd-server python3-xrootd -y
- - apt install diffutils -y
- - pip3 install --user .
+ - dnf install xrootd-client xrootd-server python3-xrootd -y
+ - dnf install diffutils
+ - pip install --user .
- python3 -c 'import quickstats as q; print(q.__version__)'
fit_bbyy:
--
GitLab
From e9055cb62bfe859304562a14cd7e118aa3cec05e Mon Sep 17 00:00:00 2001
From: Yizhou Cai <yizhou.cai@cern.ch>
Date: Fri, 18 Apr 2025 18:33:13 +0800
Subject: [PATCH 6/7] test ci
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8301ef5f..55295e73 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,7 @@ before_script:
- set +e
- export PATH=${HOME}/.local/bin/:$PATH
- dnf install xrootd-client xrootd-server python3-xrootd -y
- - dnf install diffutils
+ - dnf install diffutils -y
- pip install --user .
- python3 -c 'import quickstats as q; print(q.__version__)'
--
GitLab
From 1953a3dd2a0011c0366e72df50b5eda378a7047f Mon Sep 17 00:00:00 2001
From: Yizhou Cai <yizhou.cai@cern.ch>
Date: Fri, 18 Apr 2025 18:40:24 +0800
Subject: [PATCH 7/7] test ci
---
.gitlab-ci.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 55295e73..b9bd82c4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,6 @@ before_script:
- set +e
- export PATH=${HOME}/.local/bin/:$PATH
- dnf install xrootd-client xrootd-server python3-xrootd -y
- - dnf install diffutils -y
- pip install --user .
- python3 -c 'import quickstats as q; print(q.__version__)'
@@ -65,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;
@@ -86,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;
--
GitLab