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-osx.yml | 43 +++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 .github/workflows/pip-packaging-osx.yml (limited to '.github/workflows/pip-packaging-osx.yml') 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 -- 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/workflows/pip-packaging-osx.yml') 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/workflows/pip-packaging-osx.yml') 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/workflows/pip-packaging-osx.yml') 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 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/workflows/pip-packaging-osx.yml') 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 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/workflows/pip-packaging-osx.yml') 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/workflows/pip-packaging-osx.yml') 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/workflows/pip-packaging-osx.yml') 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/workflows/pip-packaging-osx.yml') 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 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/workflows/pip-packaging-osx.yml') 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/workflows/pip-packaging-osx.yml') 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 From 250eb63a0424773344e6ada290dc42a4f5cee67b Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 4 Aug 2020 10:46:19 +0200 Subject: Do not pay attention to brew installation result --- .github/workflows/pip-packaging-osx.yml | 3 ++- azure-pipelines.yml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to '.github/workflows/pip-packaging-osx.yml') diff --git a/.github/workflows/pip-packaging-osx.yml b/.github/workflows/pip-packaging-osx.yml index 85c3c807..c94369ac 100644 --- a/.github/workflows/pip-packaging-osx.yml +++ b/.github/workflows/pip-packaging-osx.yml @@ -22,7 +22,8 @@ jobs: architecture: x64 - name: Install dependencies run: | - brew update && brew install boost eigen gmp mpfr cgal + brew update || true + brew install boost eigen gmp mpfr cgal || true python -m pip install --user -r .github/build-requirements.txt python -m pip install --user twine delocate - name: Build python wheel diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 48291fbc..8e88cab5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -9,7 +9,6 @@ jobs: variables: pythonVersion: '3.6' cmakeBuildType: Release - customInstallation: 'brew update && brew install graphviz doxygen boost eigen gmp mpfr tbb cgal' steps: - bash: echo "##vso[task.prependpath]$CONDA/bin" @@ -23,7 +22,8 @@ jobs: sudo conda install --yes --quiet --name gudhi_build_env python=$(pythonVersion) python -m pip install --user -r .github/build-requirements.txt python -m pip install --user -r .github/test-requirements.txt - $(customInstallation) + brew update || true + brew install graphviz doxygen boost eigen gmp mpfr tbb cgal || true displayName: 'Install build dependencies' - bash: | source activate gudhi_build_env -- cgit v1.2.3