From c62e794d4b8ee0c3318f8a03df1f2bc5774b9881 Mon Sep 17 00:00:00 2001 From: Vincent Rouvreau Date: Thu, 13 Jun 2024 18:05:25 +0200 Subject: [PATCH] Update packages and add pandas to test-requirement --- Dockerfile_for_circleci_image | 4 ++-- Dockerfile_for_circleci_image_without_cgal | 8 ++++---- Dockerfile_for_pip | 6 +++--- install_cgal.sh | 2 +- test-requirements.txt | 1 + 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Dockerfile_for_circleci_image b/Dockerfile_for_circleci_image index 3372193..c1ec741 100644 --- a/Dockerfile_for_circleci_image +++ b/Dockerfile_for_circleci_image @@ -23,8 +23,8 @@ RUN apt update && apt install -y make \ ADD build-requirements.txt / ADD test-requirements.txt / -RUN pip3 install -r build-requirements.txt -RUN pip3 --no-cache-dir install -r test-requirements.txt +RUN python3 -m pip install --user -r build-requirements.txt +RUN python3 -m pip --no-cache-dir install --user -r test-requirements.txt # Try to do the same layers as Dockerfile_for_circle_ci_image_without_cgal RUN apt install -y libeigen3-dev \ diff --git a/Dockerfile_for_circleci_image_without_cgal b/Dockerfile_for_circleci_image_without_cgal index 1dc0eb8..9b9a0c9 100644 --- a/Dockerfile_for_circleci_image_without_cgal +++ b/Dockerfile_for_circleci_image_without_cgal @@ -23,12 +23,12 @@ RUN apt update && apt install -y make \ ADD build-requirements.txt / ADD test-requirements.txt / -RUN pip3 install -r build-requirements.txt -RUN pip3 --no-cache-dir install -r test-requirements.txt +RUN python3 -m pip install --user -r build-requirements.txt +RUN python3 -m pip --no-cache-dir install --user -r test-requirements.txt # Try to do the same layers as Dockerfile_for_circle_ci_image -RUN curl -LO "https://gitlab.com/libeigen/eigen/-/archive/3.3.9/eigen-3.3.9.tar.gz" \ - && tar xf eigen-3.3.9.tar.gz +RUN curl -LO "https://gitlab.com/libeigen/eigen/-/archive/3.4.0/eigen-3.4.0.tar.gz" \ + && tar xf eigen-3.4.0.tar.gz # apt clean up RUN apt autoremove && rm -rf /var/lib/apt/lists/* diff --git a/Dockerfile_for_pip b/Dockerfile_for_pip index ea4f8ef..6fe955d 100644 --- a/Dockerfile_for_pip +++ b/Dockerfile_for_pip @@ -14,9 +14,9 @@ RUN mkdir -p /opt/cmake \ && rm -f cmake-3.16.2-Linux-x86_64.sh # yum install boost-devel installs boost 1.53 and copy is the only way to install headers only boost -RUN curl -LO "https://boostorg.jfrog.io/artifactory/main/release/1.82.0/source/boost_1_82_0.tar.gz" \ - && tar xf boost_1_82_0.tar.gz \ - && cd boost_1_82_0 \ +RUN curl -LO "https://boostorg.jfrog.io/artifactory/main/release/1.85.0/source/boost_1_85_0.tar.gz" \ + && tar xf boost_1_85_0.tar.gz \ + && cd boost_1_85_0 \ && ./bootstrap.sh \ && ls \ && cp -r boost /usr/local/include/ \ diff --git a/install_cgal.sh b/install_cgal.sh index f0f221c..b8adf4c 100644 --- a/install_cgal.sh +++ b/install_cgal.sh @@ -3,7 +3,7 @@ # error management : https://dev.to/banks/stop-ignoring-errors-in-bash-3co5 set -ue -export CGAL_VERSION="5.4.1" +export CGAL_VERSION="5.6.1" curl -LO "https://github.com/CGAL/cgal/releases/download/v${CGAL_VERSION}/CGAL-${CGAL_VERSION}.tar.xz" tar xf CGAL-${CGAL_VERSION}.tar.xz diff --git a/test-requirements.txt b/test-requirements.txt index 62f10fa..9cf1689 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -7,6 +7,7 @@ pydata-sphinx-theme>=0.8.0 matplotlib scipy>=1.6.0 scikit-learn>=0.24.0 +pandas # Required by scikit-learn >= 1.5.0 for fetch_openml POT tensorflow tensorflow-addons