diff --git a/CI/Fedora/Dockerfile b/CI/Fedora/Dockerfile index 9a5437b2322af569e422b52025f33846ad27edc1..c8dc14f67a3c7251d66cb4fc6f54334bb5f8df84 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 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]+' # 22 -- cmake is too old, no libzstd libzstd-devel diff --git a/python/test/test_IO7.py b/python/test/test_IO7.py index 7b1299c96202a38c79881f549aa9691549b253b2..f2d0584e1e5f77373540ab2e7d5f399ff1f7a5df 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: