From 28f4e8dadb328d40cc7358951abeff4f190c295f Mon Sep 17 00:00:00 2001 From: Andrii Verbytskyi <you@example.com> Date: Thu, 26 Dec 2024 18:39:55 +0100 Subject: [PATCH 1/2] Add uproot5 to the tests --- CI/Fedora/Dockerfile | 3 +++ python/test/test_IO7.py | 9 +++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CI/Fedora/Dockerfile b/CI/Fedora/Dockerfile index 9a5437b2..9a2df5a9 100644 --- a/CI/Fedora/Dockerfile +++ b/CI/Fedora/Dockerfile @@ -15,6 +15,9 @@ RUN if [ $(cat /etc/fedora-release | grep -Eo '[0-9]+') -eq RUN if [ $(cat /etc/fedora-release | grep -Eo '[0-9]+') -eq 33 ]; then yum -y install pypy pypy-devel; fi && yum -y clean all RUN if [ $(cat /etc/fedora-release | grep -Eo '[0-9]+') -gt 30 ]; then yum -y install liburing liburing-devel; fi && yum -y clean all RUN if [ $(cat /etc/fedora-release | grep -Eo '[0-9]+') -gt 32 ]; then yum -y install python3-zstandard; fi && yum -y clean all +# Uproot5 +RUN if [ $(cat /etc/fedora-release | grep -Eo '[0-9]+') -gt 39 ]; then yum -y install xxhash xxhash-devel python3-xxhash python3-cramjam; fi && yum -y clean all +RUN if [ $(cat /etc/fedora-release | grep -Eo '[0-9]+') -gt 39 ]; then pip install uproot --upgrade --upgrade-strategy only-if-needed; fi # cat /etc/fedora-release | grep -Eo '[0-9]+' # 22 -- cmake is too old, no libzstd libzstd-devel diff --git a/python/test/test_IO7.py b/python/test/test_IO7.py index 7b1299c9..f2d0584e 100644 --- a/python/test/test_IO7.py +++ b/python/test/test_IO7.py @@ -17,12 +17,9 @@ def test_IO7(): import uproot import numpy - if ( - int(uproot.__version__.split(".")[2]) - + int(uproot.__version__.split(".")[1]) * 100 - + int(uproot.__version__.split(".")[0]) * 10000 - < 40000 - ): + uprootversion = int(uproot.__version__.split(".")[2]) + int(uproot.__version__.split(".")[1]) * 100 + int(uproot.__version__.split(".")[0]) * 10000 + print("uproot version: "+str(uprootversion)) + if (uprootversion < 40000): print("uproot version is too old. Exit.\n") return 0 except ImportError as e: -- GitLab From c5822fa1a689a825694d99681ec0649c96402945 Mon Sep 17 00:00:00 2001 From: Andrii Verbytskyi <you@example.com> Date: Thu, 26 Dec 2024 18:53:13 +0100 Subject: [PATCH 2/2] Add uproot5 to the tests --- CI/Fedora/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CI/Fedora/Dockerfile b/CI/Fedora/Dockerfile index 9a2df5a9..c8dc14f6 100644 --- a/CI/Fedora/Dockerfile +++ b/CI/Fedora/Dockerfile @@ -16,7 +16,7 @@ RUN if [ $(cat /etc/fedora-release | grep -Eo '[0-9]+') -eq RUN if [ $(cat /etc/fedora-release | grep -Eo '[0-9]+') -gt 30 ]; then yum -y install liburing liburing-devel; fi && yum -y clean all RUN if [ $(cat /etc/fedora-release | grep -Eo '[0-9]+') -gt 32 ]; then yum -y install python3-zstandard; fi && yum -y clean all # Uproot5 -RUN if [ $(cat /etc/fedora-release | grep -Eo '[0-9]+') -gt 39 ]; then yum -y install xxhash xxhash-devel python3-xxhash python3-cramjam; fi && yum -y clean all +RUN if [ $(cat /etc/fedora-release | grep -Eo '[0-9]+') -gt 39 ]; then yum -y install xxhash xxhash-devel python3-xxhash python3-cramjam python3-fsspec python3-packaging; fi && yum -y clean all RUN if [ $(cat /etc/fedora-release | grep -Eo '[0-9]+') -gt 39 ]; then pip install uproot --upgrade --upgrade-strategy only-if-needed; fi # cat /etc/fedora-release | grep -Eo '[0-9]+' -- GitLab