Skip to content

Commit

Permalink
Merge pull request #33 from VincentRouvreau/update_and_pandas
Browse files Browse the repository at this point in the history
Update packages
  • Loading branch information
VincentRouvreau authored Jun 13, 2024
2 parents fa3ae93 + c62e794 commit cb607b7
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 10 deletions.
4 changes: 2 additions & 2 deletions Dockerfile_for_circleci_image
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile_for_circleci_image_without_cgal
Original file line number Diff line number Diff line change
Expand Up @@ -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/*
6 changes: 3 additions & 3 deletions Dockerfile_for_pip
Original file line number Diff line number Diff line change
Expand Up @@ -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/ \
Expand Down
2 changes: 1 addition & 1 deletion install_cgal.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions test-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit cb607b7

Please sign in to comment.