diff options
| author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-06-06 12:06:33 +0200 |
|---|---|---|
| committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-06-06 12:06:33 +0200 |
| commit | 4559eccd8b1c3610f7a82a709929013303368506 (patch) | |
| tree | 007bb544de3de2539e8e3d95a5b4cdc9a08be117 | |
| parent | 59d3fa0aa4ed6628f0dfbe3424c1d7a5c6f9a382 (diff) | |
Try with devtoolset-8 and boost clone from git
| -rw-r--r-- | .github/workflows/pip-packaging-osx.yml | 4 | ||||
| -rw-r--r-- | CMakeGUDHIVersion.txt | 2 | ||||
| -rw-r--r-- | Dockerfile_for_pip | 11 |
3 files changed, 11 insertions, 6 deletions
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}" |