From 17ffc79e1db329fa4366666a15b373d200df90b1 Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Fri, 29 May 2020 22:23:31 +0200
Subject: Try to build wheels

---
 Dockerfile_for_pip | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 Dockerfile_for_pip

(limited to 'Dockerfile_for_pip')

diff --git a/Dockerfile_for_pip b/Dockerfile_for_pip
new file mode 100644
index 00000000..0f4fa8a0
--- /dev/null
+++ b/Dockerfile_for_pip
@@ -0,0 +1,46 @@
+FROM quay.io/pypa/manylinux2014_x86_64
+
+RUN yum -y update && yum -y install \
+    wget \
+    zlib-devel \
+    eigen3-devel \
+    mpfr-devel \
+    gmp-devel \
+    && yum clean all
+
+RUN mkdir -p /opt/cmake \
+    && wget https://github.com/Kitware/CMake/releases/download/v3.16.2/cmake-3.16.2-Linux-x86_64.sh \
+    && sh cmake-3.16.2-Linux-x86_64.sh  --skip-license --prefix=/opt/cmake \
+    && rm -f cmake-3.16.2-Linux-x86_64.sh
+
+RUN wget https://dl.bintray.com/boostorg/release/1.64.0/source/boost_1_64_0.tar.gz \
+    && tar xf boost_1_64_0.tar.gz \
+    && cd boost_1_64_0 \
+    && ./bootstrap.sh --with-libraries=filesystem,program_options,system,thread,test \
+    && ./b2 install \
+    && cd .. \
+    && rm -rf boost_1_64_0
+
+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 \
+    && mkdir build \
+    && cd build \
+    && /opt/cmake/bin/cmake -DCMAKE_BUILD_TYPE=Release ../CGAL-5.0.2/ \
+    && make install \
+    && cd .. \
+    && rm -rf build CGAL-5.0.2
+
+ADD .github/build-requirements.txt /
+
+RUN /opt/python/cp35-cp35m/bin/pip install -r build-requirements.txt \
+    && /opt/python/cp36-cp36m/bin/pip install -r build-requirements.txt\
+    && /opt/python/cp37-cp37m/bin/pip install -r build-requirements.txt\
+    && /opt/python/cp38-cp38/bin/pip install -r build-requirements.txt\
+    && /opt/python/cp38-cp38/bin/pip install twine
+
+ENV PYTHON35="/opt/python/cp35-cp35m/"
+ENV PYTHON36="/opt/python/cp36-cp36m/"
+ENV PYTHON37="/opt/python/cp37-cp37m/"
+ENV PYTHON38="/opt/python/cp38-cp38/"
+
+ENV PATH="/opt/cmake/bin:${PATH}"
-- 
cgit v1.2.3


From 4559eccd8b1c3610f7a82a709929013303368506 Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Sat, 6 Jun 2020 12:06:33 +0200
Subject: Try with devtoolset-8 and boost clone from git

---
 .github/workflows/pip-packaging-osx.yml |  4 +++-
 CMakeGUDHIVersion.txt                   |  2 +-
 Dockerfile_for_pip                      | 11 +++++++----
 3 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'Dockerfile_for_pip')

diff --git a/.github/workflows/pip-packaging-osx.yml b/.github/workflows/pip-packaging-osx.yml
index f30b89d8..1f669a5e 100644
--- a/.github/workflows/pip-packaging-osx.yml
+++ b/.github/workflows/pip-packaging-osx.yml
@@ -41,4 +41,6 @@ jobs:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
         run: |
-          python -m twine upload --repository-url https://test.pypi.org/legacy/ build/src/python/dist/*
\ No newline at end of file
+          mkdir wheelhouse
+          delocate-listdeps build/src/python/dist/* && delocate-wheel --require-archs x86_64 -w wheelhouse build/src/python/dist/*
+          python -m twine upload --repository-url https://test.pypi.org/legacy/ wheelhouse/*
\ No newline at end of file
diff --git a/CMakeGUDHIVersion.txt b/CMakeGUDHIVersion.txt
index 95e67372..d1490bd3 100644
--- a/CMakeGUDHIVersion.txt
+++ b/CMakeGUDHIVersion.txt
@@ -1,6 +1,6 @@
 set (GUDHI_MAJOR_VERSION 3)
 set (GUDHI_MINOR_VERSION 2)
-set (GUDHI_PATCH_VERSION 0a7)
+set (GUDHI_PATCH_VERSION 0a8)
 set(GUDHI_VERSION ${GUDHI_MAJOR_VERSION}.${GUDHI_MINOR_VERSION}.${GUDHI_PATCH_VERSION})
 
 message(STATUS "GUDHI version : ${GUDHI_VERSION}")
diff --git a/Dockerfile_for_pip b/Dockerfile_for_pip
index 0f4fa8a0..8f60e37c 100644
--- a/Dockerfile_for_pip
+++ b/Dockerfile_for_pip
@@ -6,6 +6,7 @@ RUN yum -y update && yum -y install \
     eigen3-devel \
     mpfr-devel \
     gmp-devel \
+    devtoolset-8 \
     && yum clean all
 
 RUN mkdir -p /opt/cmake \
@@ -13,13 +14,14 @@ RUN mkdir -p /opt/cmake \
     && sh cmake-3.16.2-Linux-x86_64.sh  --skip-license --prefix=/opt/cmake \
     && rm -f cmake-3.16.2-Linux-x86_64.sh
 
-RUN wget https://dl.bintray.com/boostorg/release/1.64.0/source/boost_1_64_0.tar.gz \
-    && tar xf boost_1_64_0.tar.gz \
-    && cd boost_1_64_0 \
+RUN git clone -b boost-1.73.0 --depth 1 https://github.com/boostorg/boost.git \
+    && cd boost \
+    && git submodule update --init \
     && ./bootstrap.sh --with-libraries=filesystem,program_options,system,thread,test \
+    && ./b2 headers \
     && ./b2 install \
     && cd .. \
-    && rm -rf boost_1_64_0
+    && 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 \
@@ -44,3 +46,4 @@ ENV PYTHON37="/opt/python/cp37-cp37m/"
 ENV PYTHON38="/opt/python/cp38-cp38/"
 
 ENV PATH="/opt/cmake/bin:${PATH}"
+ENV PATH="/opt/rh/devtoolset-8/root/usr/bin:${PATH}"
-- 
cgit v1.2.3