From 129e85610cfd5a1e3db7f7d656e99915b96a3be5 Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Thu, 20 Aug 2020 14:17:31 +0200
Subject: Some cleanup. CircleCI docker image build requires update

---
 Dockerfile_for_circleci_image | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'Dockerfile_for_circleci_image')

diff --git a/Dockerfile_for_circleci_image b/Dockerfile_for_circleci_image
index 464097e7..87f57071 100644
--- a/Dockerfile_for_circleci_image
+++ b/Dockerfile_for_circleci_image
@@ -23,6 +23,9 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
+# Update again
+RUN apt-get update
+
 # Required for Gudhi compilation
 RUN apt-get install -y make \
     git \
-- 
cgit v1.2.3


From c6619e0207abf0fb5198b66a8d8f00f975c3da84 Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Fri, 18 Sep 2020 16:27:49 +0200
Subject: Use CGAL 5.1 by default on dockers. Update next release

---
 .github/next_release.md       |  6 +++---
 Dockerfile_for_circleci_image | 10 +++++++++-
 Dockerfile_for_pip            |  8 ++++----
 Dockerfile_gudhi_installation | 12 ++++++++++++
 4 files changed, 28 insertions(+), 8 deletions(-)

(limited to 'Dockerfile_for_circleci_image')

diff --git a/.github/next_release.md b/.github/next_release.md
index cd2376eb..190f8408 100644
--- a/.github/next_release.md
+++ b/.github/next_release.md
@@ -1,13 +1,13 @@
 We are pleased to announce the release 3.4.0 of the GUDHI library.
 
-As a major new feature, the GUDHI library now offers ...
+As a major new feature, the GUDHI library now offers dD weighted alpha complex, ...
 
 We are now using GitHub to develop the GUDHI library, do not hesitate to [fork the GUDHI project on GitHub](https://github.com/GUDHI/gudhi-devel). From a user point of view, we recommend to download GUDHI user version (gudhi.3.4.0.tar.gz).
 
 Below is a list of changes made since GUDHI 3.3.0:
 
-- [Module](link)
-     - ...
+- [Alpha complex](https://gudhi.inria.fr/doc/latest/group__alpha__complex.html)
+     - the C++ weighted version for alpha complex is now available in dimension D.
 
 - [Module](link)
      - ...
diff --git a/Dockerfile_for_circleci_image b/Dockerfile_for_circleci_image
index 87f57071..ec1b8ff8 100644
--- a/Dockerfile_for_circleci_image
+++ b/Dockerfile_for_circleci_image
@@ -41,7 +41,6 @@ RUN apt-get install -y make \
     libgmp3-dev \
     libmpfr-dev \
     libtbb-dev \
-    libcgal-dev \
     locales \
     python3 \
     python3-pip \
@@ -51,6 +50,15 @@ RUN apt-get install -y make \
     pkg-config \
     curl
 
+RUN curl -LO "https://github.com/CGAL/cgal/releases/download/v5.1/CGAL-5.1.tar.xz" \
+    && tar xf CGAL-5.1.tar.xz \
+    && mkdir build \
+    && cd build \
+    && cmake -DCMAKE_BUILD_TYPE=Release ../CGAL-5.1/ \
+    && make install \
+    && cd .. \
+    && rm -rf build CGAL-5.1
+
 ADD .github/build-requirements.txt /
 ADD .github/test-requirements.txt /
 
diff --git a/Dockerfile_for_pip b/Dockerfile_for_pip
index 8f60e37c..83c6d684 100644
--- a/Dockerfile_for_pip
+++ b/Dockerfile_for_pip
@@ -23,14 +23,14 @@ RUN git clone -b boost-1.73.0 --depth 1 https://github.com/boostorg/boost.git \
     && cd .. \
     && rm -rf boost
 
-RUN wget https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-5.0.2/CGAL-5.0.2.tar.xz \
-    && tar xf CGAL-5.0.2.tar.xz \
+RUN wget https://github.com/CGAL/cgal/releases/download/v5.1/CGAL-5.1.tar.xz \
+    && tar xf CGAL-5.1.tar.xz \
     && mkdir build \
     && cd build \
-    && /opt/cmake/bin/cmake -DCMAKE_BUILD_TYPE=Release ../CGAL-5.0.2/ \
+    && /opt/cmake/bin/cmake -DCMAKE_BUILD_TYPE=Release ../CGAL-5.1/ \
     && make install \
     && cd .. \
-    && rm -rf build CGAL-5.0.2
+    && rm -rf build CGAL-5.1
 
 ADD .github/build-requirements.txt /
 
diff --git a/Dockerfile_gudhi_installation b/Dockerfile_gudhi_installation
index 92430fce..ebd21f8d 100644
--- a/Dockerfile_gudhi_installation
+++ b/Dockerfile_gudhi_installation
@@ -23,6 +23,9 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
+# Update again
+RUN apt-get update
+
 # Required for Gudhi compilation
 RUN apt-get install -y make \
     g++ \
@@ -47,6 +50,15 @@ RUN apt-get install -y make \
     pkg-config \
     curl
 
+RUN curl -LO "https://github.com/CGAL/cgal/releases/download/v5.1/CGAL-5.1.tar.xz" \
+    && tar xf CGAL-5.1.tar.xz \
+    && mkdir build \
+    && cd build \
+    && cmake -DCMAKE_BUILD_TYPE=Release ../CGAL-5.1/ \
+    && make install \
+    && cd .. \
+    && rm -rf build CGAL-5.1
+
 RUN pip3 install \
     numpy \
     matplotlib \
-- 
cgit v1.2.3