From 5140e8571d15fb0026dd63a67a75d0ef770a1751 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Sat, 30 May 2020 07:45:15 +0200 Subject: Add github actions --- .github/workflows/pip-packaging-linux.yml | 59 +++++++++++++++++++++++++++++ .github/workflows/pip-packaging-osx.yml | 43 +++++++++++++++++++++ .github/workflows/pip-packaging-windows.yml | 43 +++++++++++++++++++++ 3 files changed, 145 insertions(+) create mode 100644 .github/workflows/pip-packaging-linux.yml create mode 100644 .github/workflows/pip-packaging-osx.yml create mode 100644 .github/workflows/pip-packaging-windows.yml (limited to '.github') diff --git a/.github/workflows/pip-packaging-linux.yml b/.github/workflows/pip-packaging-linux.yml new file mode 100644 index 00000000..6ca28588 --- /dev/null +++ b/.github/workflows/pip-packaging-linux.yml @@ -0,0 +1,59 @@ +name: pip packaging linux + +on: + push: {} + pull_request: {} +# on: +# release: +# types: [published] + +jobs: + build: + name: build pip wheels + runs-on: ubuntu-latest + container: gudhi/pip_for_gudhi + steps: + - uses: actions/checkout@v1 + with: + submodules: true + - name: Build wheels for Python 3.5 + run: | + mkdir build_35 + cd build_35 + cmake -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=$PYTHON35/bin/python .. + cd src/python + $PYTHON35/bin/python setup.py bdist_wheel + auditwheel repair dist/*.whl + - name: Build wheels for Python 3.6 + run: | + mkdir build_36 + cd build_36 + cmake -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=$PYTHON36/bin/python .. + cd src/python + $PYTHON36/bin/python setup.py bdist_wheel + auditwheel repair dist/*.whl + - name: Build wheels for Python 3.7 + run: | + mkdir build_37 + cd build_37 + cmake -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=$PYTHON37/bin/python .. + cd src/python + $PYTHON37/bin/python setup.py bdist_wheel + auditwheel repair dist/*.whl + - name: Build wheels for Python 3.8 + run: | + mkdir build_38 + cd build_38 + cmake -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=$PYTHON38/bin/python .. + cd src/python + $PYTHON38/bin/python setup.py bdist_wheel + auditwheel repair dist/*.whl + - name: Publish on PyPi + env: + TWINE_USERNAME: __token__ + TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} + run: | + $PYTHON38/bin/twine upload build_35/src/python/wheelhouse/* + $PYTHON38/bin/twine upload build_36/src/python/wheelhouse/* + $PYTHON38/bin/twine upload build_37/src/python/wheelhouse/* + $PYTHON38/bin/twine upload build_38/src/python/wheelhouse/* \ No newline at end of file diff --git a/.github/workflows/pip-packaging-osx.yml b/.github/workflows/pip-packaging-osx.yml new file mode 100644 index 00000000..a571f8e0 --- /dev/null +++ b/.github/workflows/pip-packaging-osx.yml @@ -0,0 +1,43 @@ +name: pip packaging osx + +on: + push: {} + pull_request: {} +# on: +# release: +# types: [published] + +jobs: + build: + runs-on: macos-latest + strategy: + max-parallel: 4 + matrix: + python-version: ['3.5', '3.6', '3.7', '3.8'] + name: Build wheels for Python ${{ matrix.python-version }} + steps: + - uses: actions/checkout@v1 + with: + submodules: true + - uses: actions/setup-python@v1 + with: + python-version: ${{ matrix.python-version }} + architecture: x64 + - name: Install dependencies + run: | + brew update && brew install boost eigen gmp mpfr cgal + python -m pip install --user -r .github/build-requirements.txt + python -m pip install --user twine + - name: Build python wheel + run: | + python --version + mkdir build + cd build + cmake -DCMAKE_BUILD_TYPE=Release -DPython_ADDITIONAL_VERSIONS=3 .. + cd src/python + python setup.py bdist_wheel + - name: Publish on PyPi + env: + TWINE_USERNAME: __token__ + TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} + run: twine upload dist/* \ No newline at end of file diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml new file mode 100644 index 00000000..18c6aa94 --- /dev/null +++ b/.github/workflows/pip-packaging-windows.yml @@ -0,0 +1,43 @@ +name: pip packaging osx + +on: + push: {} + pull_request: {} +# on: +# release: +# types: [published] + +jobs: + build: + runs-on: windows-latest + strategy: + max-parallel: 4 + matrix: + python-version: ['3.5', '3.6', '3.7', '3.8'] + name: Build wheels for Python ${{ matrix.python-version }} + steps: + - uses: actions/checkout@v1 + with: + submodules: true + - uses: actions/setup-python@v1 + with: + python-version: ${{ matrix.python-version }} + architecture: x64 + - name: Install dependencies + run: | + vcpkg install tbb:x64-windows boost-disjoint-sets:x64-windows boost-serialization:x64-windows boost-date-time:x64-windows boost-system:x64-windows boost-filesystem:x64-windows boost-units:x64-windows boost-thread:x64-windows boost-program-options:x64-windows eigen3:x64-windows mpfr:x64-windows mpir:x64-windows cgal:x64-windows + python -m pip install --user -r .github/build-requirements.txt + python -m pip install --user twine + - name: Build python wheel + run: | + python --version + mkdir build + cd build + cmake -DCMAKE_BUILD_TYPE=Release -DPython_ADDITIONAL_VERSIONS=3 .. + cd src/python + python setup.py bdist_wheel + - name: Publish on PyPi + env: + TWINE_USERNAME: __token__ + TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} + run: twine upload dist/* \ No newline at end of file -- cgit v1.2.3 From 22132d53dd343f0d5f6515cfc2c692b3c3a9a93d Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Sat, 30 May 2020 08:01:19 +0200 Subject: name typo --- .github/workflows/pip-packaging-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github') diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index 18c6aa94..ccd1e647 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -1,4 +1,4 @@ -name: pip packaging osx +name: pip packaging windows on: push: {} -- cgit v1.2.3 From 93cd84c7421340ce66f80509856fb43e7cb72803 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Sat, 30 May 2020 08:09:44 +0200 Subject: help cmake to find vcpkg installations --- .github/workflows/pip-packaging-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github') diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index ccd1e647..a718c8f9 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -33,7 +33,7 @@ jobs: python --version mkdir build cd build - cmake -DCMAKE_BUILD_TYPE=Release -DPython_ADDITIONAL_VERSIONS=3 .. + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DPython_ADDITIONAL_VERSIONS=3 .. cd src/python python setup.py bdist_wheel - name: Publish on PyPi -- cgit v1.2.3 From 769bd322ace39ea712d0a21cd02f3598fd8ac149 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Sat, 30 May 2020 08:28:46 +0200 Subject: use python -m twine as recommended --- .github/workflows/pip-packaging-linux.yml | 8 ++++---- .github/workflows/pip-packaging-osx.yml | 2 +- .github/workflows/pip-packaging-windows.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to '.github') diff --git a/.github/workflows/pip-packaging-linux.yml b/.github/workflows/pip-packaging-linux.yml index 6ca28588..7f5a8df6 100644 --- a/.github/workflows/pip-packaging-linux.yml +++ b/.github/workflows/pip-packaging-linux.yml @@ -53,7 +53,7 @@ jobs: TWINE_USERNAME: __token__ TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} run: | - $PYTHON38/bin/twine upload build_35/src/python/wheelhouse/* - $PYTHON38/bin/twine upload build_36/src/python/wheelhouse/* - $PYTHON38/bin/twine upload build_37/src/python/wheelhouse/* - $PYTHON38/bin/twine upload build_38/src/python/wheelhouse/* \ No newline at end of file + $PYTHON38/bin/python -m twine upload build_35/src/python/wheelhouse/* + $PYTHON38/bin/python -m twine upload build_36/src/python/wheelhouse/* + $PYTHON38/bin/python -m twine upload build_37/src/python/wheelhouse/* + $PYTHON38/bin/python -m twine upload build_38/src/python/wheelhouse/* \ No newline at end of file diff --git a/.github/workflows/pip-packaging-osx.yml b/.github/workflows/pip-packaging-osx.yml index a571f8e0..97a3c7ea 100644 --- a/.github/workflows/pip-packaging-osx.yml +++ b/.github/workflows/pip-packaging-osx.yml @@ -40,4 +40,4 @@ jobs: env: TWINE_USERNAME: __token__ TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} - run: twine upload dist/* \ No newline at end of file + run: python -m twine upload dist/* \ No newline at end of file diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index a718c8f9..5c890b68 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -40,4 +40,4 @@ jobs: env: TWINE_USERNAME: __token__ TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} - run: twine upload dist/* \ No newline at end of file + run: python -m twine upload dist/* \ No newline at end of file -- cgit v1.2.3 From 9813f905ac8dbc814d3ff4f078df4125779b467f Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Sun, 31 May 2020 08:22:02 +0200 Subject: Upload on testpypi --- .github/workflows/pip-packaging-linux.yml | 8 ++++---- .github/workflows/pip-packaging-osx.yml | 2 +- .github/workflows/pip-packaging-windows.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to '.github') diff --git a/.github/workflows/pip-packaging-linux.yml b/.github/workflows/pip-packaging-linux.yml index 7f5a8df6..485ef643 100644 --- a/.github/workflows/pip-packaging-linux.yml +++ b/.github/workflows/pip-packaging-linux.yml @@ -53,7 +53,7 @@ jobs: TWINE_USERNAME: __token__ TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} run: | - $PYTHON38/bin/python -m twine upload build_35/src/python/wheelhouse/* - $PYTHON38/bin/python -m twine upload build_36/src/python/wheelhouse/* - $PYTHON38/bin/python -m twine upload build_37/src/python/wheelhouse/* - $PYTHON38/bin/python -m twine upload build_38/src/python/wheelhouse/* \ No newline at end of file + $PYTHON38/bin/python -m twine upload --repository-url https://test.pypi.org/legacy/ build_35/src/python/wheelhouse/* + $PYTHON38/bin/python -m twine upload --repository-url https://test.pypi.org/legacy/ build_36/src/python/wheelhouse/* + $PYTHON38/bin/python -m twine upload --repository-url https://test.pypi.org/legacy/ build_37/src/python/wheelhouse/* + $PYTHON38/bin/python -m twine upload --repository-url https://test.pypi.org/legacy/ build_38/src/python/wheelhouse/* \ No newline at end of file diff --git a/.github/workflows/pip-packaging-osx.yml b/.github/workflows/pip-packaging-osx.yml index 97a3c7ea..c5b99ab6 100644 --- a/.github/workflows/pip-packaging-osx.yml +++ b/.github/workflows/pip-packaging-osx.yml @@ -40,4 +40,4 @@ jobs: env: TWINE_USERNAME: __token__ TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} - run: python -m twine upload dist/* \ No newline at end of file + run: python -m twine upload --repository-url https://test.pypi.org/legacy/ dist/* \ No newline at end of file diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index 5c890b68..3a70a142 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -40,4 +40,4 @@ jobs: env: TWINE_USERNAME: __token__ TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} - run: python -m twine upload dist/* \ No newline at end of file + run: python -m twine upload --repository-url https://test.pypi.org/legacy/ dist/* \ No newline at end of file -- cgit v1.2.3 From 884b53725f76c85196e783d7853ea9cc6d207378 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Sun, 31 May 2020 08:38:51 +0200 Subject: Debug traces on osx --- .github/workflows/pip-packaging-osx.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to '.github') diff --git a/.github/workflows/pip-packaging-osx.yml b/.github/workflows/pip-packaging-osx.yml index c5b99ab6..28dd1d53 100644 --- a/.github/workflows/pip-packaging-osx.yml +++ b/.github/workflows/pip-packaging-osx.yml @@ -36,8 +36,11 @@ jobs: cmake -DCMAKE_BUILD_TYPE=Release -DPython_ADDITIONAL_VERSIONS=3 .. cd src/python python setup.py bdist_wheel + pwd - name: Publish on PyPi env: TWINE_USERNAME: __token__ TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} - run: python -m twine upload --repository-url https://test.pypi.org/legacy/ dist/* \ No newline at end of file + run: | + pwd + python -m twine upload --repository-url https://test.pypi.org/legacy/ build/src/python/dist/* \ No newline at end of file -- cgit v1.2.3 From c4c2e870662528467ef130b3e6a9f76682a86fd1 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Sun, 31 May 2020 08:50:33 +0200 Subject: no disjoint sets found --- .github/workflows/pip-packaging-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github') diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index 3a70a142..33ba0de9 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -25,7 +25,7 @@ jobs: architecture: x64 - name: Install dependencies run: | - vcpkg install tbb:x64-windows boost-disjoint-sets:x64-windows boost-serialization:x64-windows boost-date-time:x64-windows boost-system:x64-windows boost-filesystem:x64-windows boost-units:x64-windows boost-thread:x64-windows boost-program-options:x64-windows eigen3:x64-windows mpfr:x64-windows mpir:x64-windows cgal:x64-windows + vcpkg install tbb:x64-windows boost-serialization:x64-windows boost-date-time:x64-windows boost-system:x64-windows boost-filesystem:x64-windows boost-units:x64-windows boost-thread:x64-windows boost-program-options:x64-windows eigen3:x64-windows mpfr:x64-windows mpir:x64-windows cgal:x64-windows python -m pip install --user -r .github/build-requirements.txt python -m pip install --user twine - name: Build python wheel -- cgit v1.2.3 From 974a045acfdae6a9980d9473f9dc3ece716aa0e1 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Sun, 31 May 2020 09:23:14 +0200 Subject: Add some fields for PyPi nice render --- .github/workflows/pip-packaging-osx.yml | 2 -- .github/workflows/pip-packaging-windows.yml | 4 ++-- src/python/setup.py.in | 12 +++++++++++- 3 files changed, 13 insertions(+), 5 deletions(-) (limited to '.github') diff --git a/.github/workflows/pip-packaging-osx.yml b/.github/workflows/pip-packaging-osx.yml index 28dd1d53..f30b89d8 100644 --- a/.github/workflows/pip-packaging-osx.yml +++ b/.github/workflows/pip-packaging-osx.yml @@ -36,11 +36,9 @@ jobs: cmake -DCMAKE_BUILD_TYPE=Release -DPython_ADDITIONAL_VERSIONS=3 .. cd src/python python setup.py bdist_wheel - pwd - name: Publish on PyPi env: TWINE_USERNAME: __token__ TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} run: | - pwd python -m twine upload --repository-url https://test.pypi.org/legacy/ build/src/python/dist/* \ No newline at end of file diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index 33ba0de9..687d62a9 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -25,7 +25,7 @@ jobs: architecture: x64 - name: Install dependencies run: | - vcpkg install tbb:x64-windows boost-serialization:x64-windows boost-date-time:x64-windows boost-system:x64-windows boost-filesystem:x64-windows boost-units:x64-windows boost-thread:x64-windows boost-program-options:x64-windows eigen3:x64-windows mpfr:x64-windows mpir:x64-windows cgal:x64-windows + vcpkg install tbb:x64-windows boost-graph:x64-windows boost-serialization:x64-windows boost-date-time:x64-windows boost-system:x64-windows boost-filesystem:x64-windows boost-units:x64-windows boost-thread:x64-windows boost-program-options:x64-windows eigen3:x64-windows mpfr:x64-windows mpir:x64-windows cgal:x64-windows python -m pip install --user -r .github/build-requirements.txt python -m pip install --user twine - name: Build python wheel @@ -40,4 +40,4 @@ jobs: env: TWINE_USERNAME: __token__ TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} - run: python -m twine upload --repository-url https://test.pypi.org/legacy/ dist/* \ No newline at end of file + run: python -m twine upload --repository-url https://test.pypi.org/legacy/ build/src/python/dist/* \ No newline at end of file diff --git a/src/python/setup.py.in b/src/python/setup.py.in index b9f4e3f0..55d2b604 100644 --- a/src/python/setup.py.in +++ b/src/python/setup.py.in @@ -68,7 +68,17 @@ setup( author='GUDHI Editorial Board', author_email='gudhi-contact@lists.gforge.inria.fr', version='@GUDHI_VERSION@', - url='http://gudhi.gforge.inria.fr/', + url='https://gudhi.inria.fr/', + project_urls={ + 'Bug Tracker': 'https://github.com/GUDHI/gudhi-devel/issues', + 'Documentation': 'https://gudhi.inria.fr/python/latest/', + 'Source Code': 'https://github.com/GUDHI/gudhi-devel', + 'License': 'https://gudhi.inria.fr/licensing/' + }, + description='The Gudhi library is an open source library for Computational Topology and Topological Data ' \ + 'Analysis (TDA). It offers state-of-the-art algorithms to construct various types of simplicial complexes, ' \ + 'data structures to represent them, and algorithms to compute geometric approximations of shapes and ' \ + 'persistent homology.', ext_modules = ext_modules, install_requires = ['cython','numpy >= 1.9',], setup_requires = ['numpy >= 1.9','pybind11',], -- cgit v1.2.3 From 7bc7712b14501c212e5b162d7317f118c6586546 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Sun, 31 May 2020 09:28:54 +0200 Subject: Try to find gmp --- .github/workflows/pip-packaging-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github') diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index 687d62a9..53abc036 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -33,7 +33,7 @@ jobs: python --version mkdir build cd build - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DPython_ADDITIONAL_VERSIONS=3 .. + cmake -DCMAKE_BUILD_TYPE=Release -DGMP_INCLUDE_DIR="c:/vcpkg/installed/x64-windows/include" -DGMP_LIBRARIES="c:/vcpkg/installed/x64-windows/lib/mpir.lib" -DGMP_LIBRARIES_DIR="c:/vcpkg/installed/x64-windows/lib" -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DPython_ADDITIONAL_VERSIONS=3 .. cd src/python python setup.py bdist_wheel - name: Publish on PyPi -- cgit v1.2.3 From cfee936a422733f995fd1f7ae2ea7baa0cc07deb Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Sun, 31 May 2020 09:54:19 +0200 Subject: Re-build all from scratch --- .github/workflows/pip-packaging-linux.yml | 1 + 1 file changed, 1 insertion(+) (limited to '.github') diff --git a/.github/workflows/pip-packaging-linux.yml b/.github/workflows/pip-packaging-linux.yml index 485ef643..6b099243 100644 --- a/.github/workflows/pip-packaging-linux.yml +++ b/.github/workflows/pip-packaging-linux.yml @@ -3,6 +3,7 @@ name: pip packaging linux on: push: {} pull_request: {} + # on: # release: # types: [published] -- cgit v1.2.3 From 4559eccd8b1c3610f7a82a709929013303368506 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent 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 '.github') 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 From 1a853df5745576f5e18b7c820c6cf5e5e2885169 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Sat, 6 Jun 2020 14:42:04 +0200 Subject: Needs to install delocate --- .github/workflows/pip-packaging-osx.yml | 2 +- CMakeGUDHIVersion.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to '.github') diff --git a/.github/workflows/pip-packaging-osx.yml b/.github/workflows/pip-packaging-osx.yml index 1f669a5e..68fae138 100644 --- a/.github/workflows/pip-packaging-osx.yml +++ b/.github/workflows/pip-packaging-osx.yml @@ -27,7 +27,7 @@ jobs: run: | brew update && brew install boost eigen gmp mpfr cgal python -m pip install --user -r .github/build-requirements.txt - python -m pip install --user twine + python -m pip install --user twine delocate - name: Build python wheel run: | python --version diff --git a/CMakeGUDHIVersion.txt b/CMakeGUDHIVersion.txt index d1490bd3..3834c59c 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 0a8) +set (GUDHI_PATCH_VERSION 0a9) set(GUDHI_VERSION ${GUDHI_MAJOR_VERSION}.${GUDHI_MINOR_VERSION}.${GUDHI_PATCH_VERSION}) message(STATUS "GUDHI version : ${GUDHI_VERSION}") -- cgit v1.2.3 From e822b2f1e68feebccf9dd069447c5df5574dc650 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Sat, 6 Jun 2020 14:55:58 +0200 Subject: Add some debug traces for osx --- .github/workflows/pip-packaging-osx.yml | 5 ++++- CMakeGUDHIVersion.txt | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to '.github') diff --git a/.github/workflows/pip-packaging-osx.yml b/.github/workflows/pip-packaging-osx.yml index 68fae138..d7bfc66b 100644 --- a/.github/workflows/pip-packaging-osx.yml +++ b/.github/workflows/pip-packaging-osx.yml @@ -42,5 +42,8 @@ jobs: TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} run: | mkdir wheelhouse - delocate-listdeps build/src/python/dist/* && delocate-wheel --require-archs x86_64 -w wheelhouse build/src/python/dist/* + type delocate-listdeps + type delocate-wheel + 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 537feeb9..c2c68a2e 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 0a10) +set (GUDHI_PATCH_VERSION 0a11) set(GUDHI_VERSION ${GUDHI_MAJOR_VERSION}.${GUDHI_MINOR_VERSION}.${GUDHI_PATCH_VERSION}) message(STATUS "GUDHI version : ${GUDHI_VERSION}") -- cgit v1.2.3 From 8f8b0965ac79f4051fc321a6f4714082624d6561 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Mon, 8 Jun 2020 08:02:20 +0200 Subject: Use full path for delocate --- .github/workflows/pip-packaging-osx.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to '.github') diff --git a/.github/workflows/pip-packaging-osx.yml b/.github/workflows/pip-packaging-osx.yml index d7bfc66b..199e6f01 100644 --- a/.github/workflows/pip-packaging-osx.yml +++ b/.github/workflows/pip-packaging-osx.yml @@ -42,8 +42,6 @@ jobs: TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} run: | mkdir wheelhouse - type delocate-listdeps - type delocate-wheel - delocate-listdeps build/src/python/dist/* - delocate-wheel --require-archs x86_64 -w wheelhouse build/src/python/dist/* + /Users/runner/.local/bin/delocate-listdeps build/src/python/dist/* + /Users/runner/.local/bin/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 -- cgit v1.2.3 From fff2aee667a674b7da2889abdafd8cec360ef621 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Wed, 10 Jun 2020 08:08:50 +0200 Subject: Remove tbb to see if module import works better --- .github/workflows/pip-packaging-windows.yml | 2 +- CMakeGUDHIVersion.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to '.github') diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index 53abc036..96ac05c0 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -25,7 +25,7 @@ jobs: architecture: x64 - name: Install dependencies run: | - vcpkg install tbb:x64-windows boost-graph:x64-windows boost-serialization:x64-windows boost-date-time:x64-windows boost-system:x64-windows boost-filesystem:x64-windows boost-units:x64-windows boost-thread:x64-windows boost-program-options:x64-windows eigen3:x64-windows mpfr:x64-windows mpir:x64-windows cgal:x64-windows + vcpkg install boost-graph:x64-windows boost-serialization:x64-windows boost-date-time:x64-windows boost-system:x64-windows boost-filesystem:x64-windows boost-units:x64-windows boost-thread:x64-windows boost-program-options:x64-windows eigen3:x64-windows mpfr:x64-windows mpir:x64-windows cgal:x64-windows python -m pip install --user -r .github/build-requirements.txt python -m pip install --user twine - name: Build python wheel diff --git a/CMakeGUDHIVersion.txt b/CMakeGUDHIVersion.txt index d2d98dea..d93850cd 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 0a13) +set (GUDHI_PATCH_VERSION 0a14) set(GUDHI_VERSION ${GUDHI_MAJOR_VERSION}.${GUDHI_MINOR_VERSION}.${GUDHI_PATCH_VERSION}) message(STATUS "GUDHI version : ${GUDHI_VERSION}") -- cgit v1.2.3 From d52a7dc4c5d0a1a3de3cdb1074182079c0827c2f Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Wed, 10 Jun 2020 15:56:00 +0200 Subject: Add dependencies as artifacts to be able to download them --- .github/workflows/pip-packaging-windows.yml | 7 ++++++- CMakeGUDHIVersion.txt | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to '.github') diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index 96ac05c0..5d9eafe7 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -40,4 +40,9 @@ jobs: env: 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 + run: python -m twine upload --repository-url https://test.pypi.org/legacy/ build/src/python/dist/* + - name: Upload artifacts + uses: actions/upload-artifact@v1 + with: + name: dependencies + path: c:/vcpkg/installed/x64-windows/lib/ diff --git a/CMakeGUDHIVersion.txt b/CMakeGUDHIVersion.txt index d93850cd..b00d82d0 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 0a14) +set (GUDHI_PATCH_VERSION 0a15) set(GUDHI_VERSION ${GUDHI_MAJOR_VERSION}.${GUDHI_MINOR_VERSION}.${GUDHI_PATCH_VERSION}) message(STATUS "GUDHI version : ${GUDHI_VERSION}") -- cgit v1.2.3 From 70caa9be348c87526e2d41194a3618d14633b7dc Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Wed, 10 Jun 2020 17:00:40 +0200 Subject: Add dependencies as artifacts to be able to download them --- .github/workflows/pip-packaging-windows.yml | 2 +- CMakeGUDHIVersion.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to '.github') diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index 5d9eafe7..95205258 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -45,4 +45,4 @@ jobs: uses: actions/upload-artifact@v1 with: name: dependencies - path: c:/vcpkg/installed/x64-windows/lib/ + path: c:/vcpkg/installed/x64-windows/bin/ diff --git a/CMakeGUDHIVersion.txt b/CMakeGUDHIVersion.txt index b00d82d0..4ad3921d 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 0a15) +set (GUDHI_PATCH_VERSION 0a16) set(GUDHI_VERSION ${GUDHI_MAJOR_VERSION}.${GUDHI_MINOR_VERSION}.${GUDHI_PATCH_VERSION}) message(STATUS "GUDHI version : ${GUDHI_VERSION}") -- cgit v1.2.3 From e4a59f9ec6685534b03474cbcfe9395d601516e2 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Thu, 11 Jun 2020 07:23:23 +0200 Subject: Add distributor the right to add dll to the package --- .github/workflows/pip-packaging-windows.yml | 7 ++----- CMakeGUDHIVersion.txt | 2 +- src/python/CMakeLists.txt | 5 ++++- src/python/gudhi/__init__.py.in | 3 +++ src/python/gudhi/_distributor_init.py | 18 ++++++++++++++++++ 5 files changed, 28 insertions(+), 7 deletions(-) create mode 100644 src/python/gudhi/_distributor_init.py (limited to '.github') diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index 95205258..fe4d0227 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -35,14 +35,11 @@ jobs: cd build cmake -DCMAKE_BUILD_TYPE=Release -DGMP_INCLUDE_DIR="c:/vcpkg/installed/x64-windows/include" -DGMP_LIBRARIES="c:/vcpkg/installed/x64-windows/lib/mpir.lib" -DGMP_LIBRARIES_DIR="c:/vcpkg/installed/x64-windows/lib" -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DPython_ADDITIONAL_VERSIONS=3 .. cd src/python + cp c:/vcpkg/installed/x64-windows/bin/mpfr.dll .libs/ + cp c:/vcpkg/installed/x64-windows/bin/mpir.dll .libs/ python setup.py bdist_wheel - name: Publish on PyPi env: TWINE_USERNAME: __token__ TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} run: python -m twine upload --repository-url https://test.pypi.org/legacy/ build/src/python/dist/* - - name: Upload artifacts - uses: actions/upload-artifact@v1 - with: - name: dependencies - path: c:/vcpkg/installed/x64-windows/bin/ diff --git a/CMakeGUDHIVersion.txt b/CMakeGUDHIVersion.txt index 4ad3921d..794b6ebf 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 0a16) +set (GUDHI_PATCH_VERSION 0a17) set(GUDHI_VERSION ${GUDHI_MAJOR_VERSION}.${GUDHI_MINOR_VERSION}.${GUDHI_PATCH_VERSION}) message(STATUS "GUDHI version : ${GUDHI_VERSION}") diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt index fee6b6f5..b35c8de7 100644 --- a/src/python/CMakeLists.txt +++ b/src/python/CMakeLists.txt @@ -235,8 +235,11 @@ if(PYTHONINTERP_FOUND) file(COPY "gudhi/point_cloud" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/gudhi") file(COPY "gudhi/weighted_rips_complex.py" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/gudhi") - # Other .py files + # Some files for pip package file(COPY "introduction.rst" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/") + file(COPY "gudhi/_distributor_init.py" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/gudhi") + file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/gudhi/.libs") + message(" o o o ${CMAKE_CURRENT_BINARY_DIR}/gudhi/.libs") add_custom_command( OUTPUT gudhi.so diff --git a/src/python/gudhi/__init__.py.in b/src/python/gudhi/__init__.py.in index 79e12fbc..e4198dcf 100644 --- a/src/python/gudhi/__init__.py.in +++ b/src/python/gudhi/__init__.py.in @@ -10,6 +10,9 @@ from importlib import import_module from sys import exc_info +# Allow distributors to run custom init code +from . import _distributor_init + __author__ = "GUDHI Editorial Board" __copyright__ = "Copyright (C) 2016 Inria" __license__ = "https://gudhi.inria.fr/licensing/" diff --git a/src/python/gudhi/_distributor_init.py b/src/python/gudhi/_distributor_init.py new file mode 100644 index 00000000..0ed451f9 --- /dev/null +++ b/src/python/gudhi/_distributor_init.py @@ -0,0 +1,18 @@ +''' +Helper to preload windows dlls to prevent dll not found errors. +Once a DLL is preloaded, its namespace is made available to any subsequent DLL. +''' +import os +from ctypes import WinDLL +import glob +if os.name == 'nt': + # convention for storing / loading the DLL from gudhi/.libs/, if present + try: + basedir = os.path.dirname(__file__) + except: + pass + else: + libs_dir = os.path.abspath(os.path.join(basedir, '.libs')) + if os.path.isdir(libs_dir): + for filename in glob.glob(os.path.join(libs_dir, '*dll')): + WinDLL(os.path.abspath(filename)) -- cgit v1.2.3 From c04ff4c1f5c6aa7115c2e0e57f5ecc3ebb153fb2 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Thu, 11 Jun 2020 07:48:59 +0200 Subject: bad destination --- .github/workflows/pip-packaging-windows.yml | 4 ++-- CMakeGUDHIVersion.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to '.github') diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index fe4d0227..f229b74f 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -35,8 +35,8 @@ jobs: cd build cmake -DCMAKE_BUILD_TYPE=Release -DGMP_INCLUDE_DIR="c:/vcpkg/installed/x64-windows/include" -DGMP_LIBRARIES="c:/vcpkg/installed/x64-windows/lib/mpir.lib" -DGMP_LIBRARIES_DIR="c:/vcpkg/installed/x64-windows/lib" -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DPython_ADDITIONAL_VERSIONS=3 .. cd src/python - cp c:/vcpkg/installed/x64-windows/bin/mpfr.dll .libs/ - cp c:/vcpkg/installed/x64-windows/bin/mpir.dll .libs/ + cp c:/vcpkg/installed/x64-windows/bin/mpfr.dll gudhi/.libs/ + cp c:/vcpkg/installed/x64-windows/bin/mpir.dll gudhi/.libs/ python setup.py bdist_wheel - name: Publish on PyPi env: diff --git a/CMakeGUDHIVersion.txt b/CMakeGUDHIVersion.txt index 794b6ebf..fab3ee75 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 0a17) +set (GUDHI_PATCH_VERSION 0a18) set(GUDHI_VERSION ${GUDHI_MAJOR_VERSION}.${GUDHI_MINOR_VERSION}.${GUDHI_PATCH_VERSION}) message(STATUS "GUDHI version : ${GUDHI_VERSION}") -- cgit v1.2.3 From aec85514aeaeac51d1589e6a24c4c393df892f91 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Thu, 11 Jun 2020 12:03:49 +0200 Subject: Upload dlls from gudhi directory --- .github/workflows/pip-packaging-windows.yml | 4 ++-- CMakeGUDHIVersion.txt | 2 +- src/python/CMakeLists.txt | 3 --- src/python/gudhi/__init__.py.in | 3 --- src/python/gudhi/_distributor_init.py | 18 ------------------ src/python/setup.py.in | 1 + 6 files changed, 4 insertions(+), 27 deletions(-) delete mode 100644 src/python/gudhi/_distributor_init.py (limited to '.github') diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index f229b74f..d529d4f3 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -35,8 +35,8 @@ jobs: cd build cmake -DCMAKE_BUILD_TYPE=Release -DGMP_INCLUDE_DIR="c:/vcpkg/installed/x64-windows/include" -DGMP_LIBRARIES="c:/vcpkg/installed/x64-windows/lib/mpir.lib" -DGMP_LIBRARIES_DIR="c:/vcpkg/installed/x64-windows/lib" -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DPython_ADDITIONAL_VERSIONS=3 .. cd src/python - cp c:/vcpkg/installed/x64-windows/bin/mpfr.dll gudhi/.libs/ - cp c:/vcpkg/installed/x64-windows/bin/mpir.dll gudhi/.libs/ + cp c:/vcpkg/installed/x64-windows/bin/mpfr.dll gudhi/ + cp c:/vcpkg/installed/x64-windows/bin/mpir.dll gudhi/ python setup.py bdist_wheel - name: Publish on PyPi env: diff --git a/CMakeGUDHIVersion.txt b/CMakeGUDHIVersion.txt index 21f3d58c..85d69190 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 0a19) +set (GUDHI_PATCH_VERSION 0a20) set(GUDHI_VERSION ${GUDHI_MAJOR_VERSION}.${GUDHI_MINOR_VERSION}.${GUDHI_PATCH_VERSION}) message(STATUS "GUDHI version : ${GUDHI_VERSION}") diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt index b35c8de7..966f5ef0 100644 --- a/src/python/CMakeLists.txt +++ b/src/python/CMakeLists.txt @@ -237,9 +237,6 @@ if(PYTHONINTERP_FOUND) # Some files for pip package file(COPY "introduction.rst" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/") - file(COPY "gudhi/_distributor_init.py" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/gudhi") - file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/gudhi/.libs") - message(" o o o ${CMAKE_CURRENT_BINARY_DIR}/gudhi/.libs") add_custom_command( OUTPUT gudhi.so diff --git a/src/python/gudhi/__init__.py.in b/src/python/gudhi/__init__.py.in index e4198dcf..79e12fbc 100644 --- a/src/python/gudhi/__init__.py.in +++ b/src/python/gudhi/__init__.py.in @@ -10,9 +10,6 @@ from importlib import import_module from sys import exc_info -# Allow distributors to run custom init code -from . import _distributor_init - __author__ = "GUDHI Editorial Board" __copyright__ = "Copyright (C) 2016 Inria" __license__ = "https://gudhi.inria.fr/licensing/" diff --git a/src/python/gudhi/_distributor_init.py b/src/python/gudhi/_distributor_init.py deleted file mode 100644 index 6f3dc8a2..00000000 --- a/src/python/gudhi/_distributor_init.py +++ /dev/null @@ -1,18 +0,0 @@ -''' -Helper to preload windows dlls to prevent dll not found errors. -Once a DLL is preloaded, its namespace is made available to any subsequent DLL. -''' -import os -if os.name == 'nt': - # convention for storing / loading the DLL from gudhi/.libs/, if present - try: - basedir = os.path.dirname(__file__) - except: - pass - else: - libs_dir = os.path.abspath(os.path.join(basedir, '.libs')) - if os.path.isdir(libs_dir): - from ctypes import WinDLL - import glob - for filename in glob.glob(os.path.join(libs_dir, '*dll')): - WinDLL(os.path.abspath(filename)) diff --git a/src/python/setup.py.in b/src/python/setup.py.in index 875f1577..07ad818f 100644 --- a/src/python/setup.py.in +++ b/src/python/setup.py.in @@ -86,4 +86,5 @@ setup( ext_modules = ext_modules, install_requires = ['numpy >= 1.9',], setup_requires = ['cython','numpy >= 1.9','pybind11',], + package_data={"": ["*.dll"], }, ) -- cgit v1.2.3 From 891c4ab74faa07e0e5a10cc054cf57e5f77fdc95 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Fri, 12 Jun 2020 08:07:14 +0200 Subject: No more on test.pypi.org --- .github/workflows/pip-packaging-linux.yml | 8 ++++---- .github/workflows/pip-packaging-osx.yml | 2 +- .github/workflows/pip-packaging-windows.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to '.github') diff --git a/.github/workflows/pip-packaging-linux.yml b/.github/workflows/pip-packaging-linux.yml index 6b099243..f82122b4 100644 --- a/.github/workflows/pip-packaging-linux.yml +++ b/.github/workflows/pip-packaging-linux.yml @@ -54,7 +54,7 @@ jobs: TWINE_USERNAME: __token__ TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} run: | - $PYTHON38/bin/python -m twine upload --repository-url https://test.pypi.org/legacy/ build_35/src/python/wheelhouse/* - $PYTHON38/bin/python -m twine upload --repository-url https://test.pypi.org/legacy/ build_36/src/python/wheelhouse/* - $PYTHON38/bin/python -m twine upload --repository-url https://test.pypi.org/legacy/ build_37/src/python/wheelhouse/* - $PYTHON38/bin/python -m twine upload --repository-url https://test.pypi.org/legacy/ build_38/src/python/wheelhouse/* \ No newline at end of file + $PYTHON38/bin/python -m twine upload build_35/src/python/wheelhouse/* + $PYTHON38/bin/python -m twine upload build_36/src/python/wheelhouse/* + $PYTHON38/bin/python -m twine upload build_37/src/python/wheelhouse/* + $PYTHON38/bin/python -m twine upload build_38/src/python/wheelhouse/* \ No newline at end of file diff --git a/.github/workflows/pip-packaging-osx.yml b/.github/workflows/pip-packaging-osx.yml index 199e6f01..6861b65a 100644 --- a/.github/workflows/pip-packaging-osx.yml +++ b/.github/workflows/pip-packaging-osx.yml @@ -44,4 +44,4 @@ jobs: mkdir wheelhouse /Users/runner/.local/bin/delocate-listdeps build/src/python/dist/* /Users/runner/.local/bin/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 + python -m twine upload wheelhouse/* \ No newline at end of file diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index d529d4f3..68add90a 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -42,4 +42,4 @@ jobs: env: TWINE_USERNAME: __token__ TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} - run: python -m twine upload --repository-url https://test.pypi.org/legacy/ build/src/python/dist/* + run: python -m twine upload build/src/python/dist/* -- cgit v1.2.3 From 4ae747be301f1f159f36bd9d3c103774e1ad80ac Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Fri, 12 Jun 2020 09:19:19 +0200 Subject: Build pip packages on releases --- .github/workflows/pip-packaging-linux.yml | 8 ++------ .github/workflows/pip-packaging-osx.yml | 7 ++----- .github/workflows/pip-packaging-windows.yml | 7 ++----- 3 files changed, 6 insertions(+), 16 deletions(-) (limited to '.github') diff --git a/.github/workflows/pip-packaging-linux.yml b/.github/workflows/pip-packaging-linux.yml index f82122b4..bd524af9 100644 --- a/.github/workflows/pip-packaging-linux.yml +++ b/.github/workflows/pip-packaging-linux.yml @@ -1,12 +1,8 @@ name: pip packaging linux on: - push: {} - pull_request: {} - -# on: -# release: -# types: [published] + release: + types: [published] jobs: build: diff --git a/.github/workflows/pip-packaging-osx.yml b/.github/workflows/pip-packaging-osx.yml index 6861b65a..85c3c807 100644 --- a/.github/workflows/pip-packaging-osx.yml +++ b/.github/workflows/pip-packaging-osx.yml @@ -1,11 +1,8 @@ name: pip packaging osx on: - push: {} - pull_request: {} -# on: -# release: -# types: [published] + release: + types: [published] jobs: build: diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index 68add90a..1cadf6b1 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -1,11 +1,8 @@ name: pip packaging windows on: - push: {} - pull_request: {} -# on: -# release: -# types: [published] + release: + types: [published] jobs: build: -- cgit v1.2.3