From c60cb3bcfd3ff67113a8d8a84230ffd263b72c6e Mon Sep 17 00:00:00 2001 From: Rémi Flamary Date: Wed, 22 Apr 2020 15:38:39 +0200 Subject: add wheel build action --- .github/workflows/build_wheels.yml | 41 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 .github/workflows/build_wheels.yml (limited to '.github/workflows/build_wheels.yml') diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml new file mode 100644 index 0000000..5ade5d7 --- /dev/null +++ b/.github/workflows/build_wheels.yml @@ -0,0 +1,41 @@ +name: Build dist and wheels + +on: + push: + branches: + - 'build_wheels' + + +jobs: + build_linux: + + runs-on: ubuntu-latest + strategy: + max-parallel: 4 + matrix: + python-version: [3.5, 3.6, 3.7, 3.8] + + steps: + - uses: actions/checkout@v1 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v1 + with: + python-version: ${{ matrix.python-version }} + + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install -r requirements.txt + + - name: Install cibuildwheel + run: | + python -m pip install cibuildwheel==1.3.0 + + - name: Build wheel + run: | + python -m cibuildwheel --output-dir wheelhouse + + - uses: actions/upload-artifact@v1 + with: + name: wheels + path: ./wheelhouse \ No newline at end of file -- cgit v1.2.3 From 4aa020055a684ec8cd2360ecf47bd85f94e63e9e Mon Sep 17 00:00:00 2001 From: Rémi Flamary Date: Wed, 22 Apr 2020 15:42:56 +0200 Subject: force install cython --- .github/workflows/build_wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows/build_wheels.yml') diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 5ade5d7..d92c7c5 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -26,7 +26,7 @@ jobs: run: | python -m pip install --upgrade pip pip install -r requirements.txt - + pip install -U "cython" - name: Install cibuildwheel run: | python -m pip install cibuildwheel==1.3.0 -- cgit v1.2.3 From de5ff644d282660f34a8fad051879eca7cdc87a3 Mon Sep 17 00:00:00 2001 From: Rémi Flamary Date: Wed, 22 Apr 2020 15:47:56 +0200 Subject: propoer ciwb before build --- .github/workflows/build_wheels.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to '.github/workflows/build_wheels.yml') diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index d92c7c5..9938698 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -13,7 +13,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: [3.5, 3.6, 3.7, 3.8] + python-version: [3.8] steps: - uses: actions/checkout@v1 @@ -32,6 +32,8 @@ jobs: python -m pip install cibuildwheel==1.3.0 - name: Build wheel + env: + CIBW_BEFORE_BUILD: "pip install numpy cython" run: | python -m cibuildwheel --output-dir wheelhouse -- cgit v1.2.3 From b8c36c9a4f807b4743c296e84f3f0896a778619e Mon Sep 17 00:00:00 2001 From: Rémi Flamary Date: Wed, 22 Apr 2020 16:15:44 +0200 Subject: test build wheels windows --- .github/workflows/build_wheels.yml | 39 ++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) (limited to '.github/workflows/build_wheels.yml') diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 9938698..ed8bd3d 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -10,17 +10,44 @@ jobs: build_linux: runs-on: ubuntu-latest - strategy: - max-parallel: 4 - matrix: - python-version: [3.8] steps: - uses: actions/checkout@v1 - - name: Set up Python ${{ matrix.python-version }} + - name: Set up Python 3.8 uses: actions/setup-python@v1 with: - python-version: ${{ matrix.python-version }} + python-version: 3.8 + + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install -r requirements.txt + pip install -U "cython" + - name: Install cibuildwheel + run: | + python -m pip install cibuildwheel==1.3.0 + + - name: Build wheel + env: + CIBW_BEFORE_BUILD: "pip install numpy cython" + run: | + python -m cibuildwheel --output-dir wheelhouse + + - uses: actions/upload-artifact@v1 + with: + name: wheels + path: ./wheelhouse + + build_windows: + + runs-on: windows-2019 + + steps: + - uses: actions/checkout@v1 + - name: Set up Python 3.8 + uses: actions/setup-python@v1 + with: + python-version: 3.8 - name: Install dependencies run: | -- cgit v1.2.3 From d20ce8c4e6ef723bec0ee4f06b285dff8da8c6f7 Mon Sep 17 00:00:00 2001 From: Rémi Flamary Date: Wed, 22 Apr 2020 16:21:04 +0200 Subject: debug build wheels windows --- .github/workflows/build_wheels.yml | 44 ++++++++++---------------------------- 1 file changed, 11 insertions(+), 33 deletions(-) (limited to '.github/workflows/build_wheels.yml') diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index ed8bd3d..4874d84 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -7,9 +7,12 @@ on: jobs: - build_linux: - - runs-on: ubuntu-latest + build_wheels: + name: Build wheel on ${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-18.04, windows-latest, macos-latest] steps: - uses: actions/checkout@v1 @@ -23,40 +26,15 @@ jobs: python -m pip install --upgrade pip pip install -r requirements.txt pip install -U "cython" + - name: Install cibuildwheel run: | python -m pip install cibuildwheel==1.3.0 - - name: Build wheel - env: - CIBW_BEFORE_BUILD: "pip install numpy cython" - run: | - python -m cibuildwheel --output-dir wheelhouse - - - uses: actions/upload-artifact@v1 - with: - name: wheels - path: ./wheelhouse - - build_windows: - - runs-on: windows-2019 - - steps: - - uses: actions/checkout@v1 - - name: Set up Python 3.8 - uses: actions/setup-python@v1 - with: - python-version: 3.8 - - - name: Install dependencies + - name: Install Visual C++ for Python 2.7 + if: startsWith(matrix.os, 'windows') run: | - python -m pip install --upgrade pip - pip install -r requirements.txt - pip install -U "cython" - - name: Install cibuildwheel - run: | - python -m pip install cibuildwheel==1.3.0 + choco install vcpython27 -f -y - name: Build wheel env: @@ -67,4 +45,4 @@ jobs: - uses: actions/upload-artifact@v1 with: name: wheels - path: ./wheelhouse \ No newline at end of file + path: ./wheelhouse -- cgit v1.2.3 From 57153c8c6a30d044690b46f77ea5c584f5e5d088 Mon Sep 17 00:00:00 2001 From: Rémi Flamary Date: Wed, 22 Apr 2020 16:34:26 +0200 Subject: remove macosx --- .github/workflows/build_wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows/build_wheels.yml') diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 4874d84..9f671bf 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -12,7 +12,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-18.04, windows-latest, macos-latest] + os: [ubuntu-18.04, windows-latest] steps: - uses: actions/checkout@v1 -- cgit v1.2.3 From 6bcd9e6b988c2856b910a9c87663e4a0cbd1ea19 Mon Sep 17 00:00:00 2001 From: Rémi Flamary Date: Wed, 22 Apr 2020 20:09:14 +0200 Subject: stick to linux wheels for current release --- .github/workflows/build_wheels.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to '.github/workflows/build_wheels.yml') diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 9f671bf..b11cfaa 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -8,11 +8,12 @@ on: jobs: build_wheels: - name: Build wheel on ${{ matrix.os }} + name: ${{ matrix.os }} runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-18.04, windows-latest] + os: [ubuntu-18.04] + # macosx-latest, windows-latest steps: - uses: actions/checkout@v1 -- cgit v1.2.3 From ebf8fe9d1c3ff7885c00f695812964faf119486c Mon Sep 17 00:00:00 2001 From: Rémi Flamary Date: Thu, 23 Apr 2020 09:30:24 +0200 Subject: set action to release event --- .github/workflows/build_wheels.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to '.github/workflows/build_wheels.yml') diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index b11cfaa..7c13c33 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -1,10 +1,7 @@ name: Build dist and wheels on: - push: - branches: - - 'build_wheels' - + release: jobs: build_wheels: -- cgit v1.2.3 From 6426c182bc2546d00d18f7422d6dde150e09217c Mon Sep 17 00:00:00 2001 From: Rémi Flamary Date: Thu, 23 Apr 2020 14:19:52 +0200 Subject: add platforms and remove pp --- .github/workflows/build_wheels.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to '.github/workflows/build_wheels.yml') diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 7c13c33..a1fabc9 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -2,6 +2,9 @@ name: Build dist and wheels on: release: + push: + branches: + - "wheels_multi" jobs: build_wheels: @@ -9,7 +12,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-18.04] + os: [ubuntu-18.04, macosx-latest, windows-latest] # macosx-latest, windows-latest steps: @@ -36,6 +39,7 @@ jobs: - name: Build wheel env: + CIBW_SKIP: "pp*-win*" CIBW_BEFORE_BUILD: "pip install numpy cython" run: | python -m cibuildwheel --output-dir wheelhouse -- cgit v1.2.3 From d2575b77e90e9cc94ee60bcd548ede16740ca2fc Mon Sep 17 00:00:00 2001 From: Rémi Flamary Date: Thu, 23 Apr 2020 14:29:46 +0200 Subject: proper macos build --- .github/workflows/build_wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows/build_wheels.yml') diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index a1fabc9..da1e18f 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -12,7 +12,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-18.04, macosx-latest, windows-latest] + os: [ubuntu-18.04, macos-latest, windows-latest] # macosx-latest, windows-latest steps: -- cgit v1.2.3 From d676bc70dd3d332973ce3700ae9d7f02865fffcd Mon Sep 17 00:00:00 2001 From: Rémi Flamary Date: Thu, 23 Apr 2020 14:41:57 +0200 Subject: remove pipy for macosx --- .github/workflows/build_wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows/build_wheels.yml') diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index da1e18f..2fc8db3 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -39,7 +39,7 @@ jobs: - name: Build wheel env: - CIBW_SKIP: "pp*-win*" + CIBW_SKIP: "pp*-win* pp*-macosx*" CIBW_BEFORE_BUILD: "pip install numpy cython" run: | python -m cibuildwheel --output-dir wheelhouse -- cgit v1.2.3 From 46445382a4ee7743bb6f254fdeaf9d0abdae44d6 Mon Sep 17 00:00:00 2001 From: Rémi Flamary Date: Thu, 23 Apr 2020 14:58:52 +0200 Subject: final version --- .github/workflows/build_wheels.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to '.github/workflows/build_wheels.yml') diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 2fc8db3..1a4c173 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -2,9 +2,6 @@ name: Build dist and wheels on: release: - push: - branches: - - "wheels_multi" jobs: build_wheels: @@ -12,8 +9,8 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-18.04, macos-latest, windows-latest] - # macosx-latest, windows-latest + os: [ubuntu-latest, macos-latest, windows-latest] + # macos-latest, windows-latest steps: - uses: actions/checkout@v1 @@ -39,7 +36,7 @@ jobs: - name: Build wheel env: - CIBW_SKIP: "pp*-win* pp*-macosx*" + CIBW_SKIP: "pp*-win* pp*-macosx*" # remove pypy on mac and win (wrong version) CIBW_BEFORE_BUILD: "pip install numpy cython" run: | python -m cibuildwheel --output-dir wheelhouse -- cgit v1.2.3 From 53265dbd5530aee37a33f42e1243b26422d62acf Mon Sep 17 00:00:00 2001 From: Rémi Flamary Date: Fri, 24 Apr 2020 11:12:42 +0200 Subject: build wheels on push to master --- .github/workflows/build_wheels.yml | 3 +++ 1 file changed, 3 insertions(+) (limited to '.github/workflows/build_wheels.yml') diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 1a4c173..be1719b 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -2,6 +2,9 @@ name: Build dist and wheels on: release: + push: + branches: + - "master" jobs: build_wheels: -- cgit v1.2.3 From 27facf1f22176eabae9f710e8dd528c8aa2c9c6b Mon Sep 17 00:00:00 2001 From: Rémi Flamary Date: Mon, 4 May 2020 15:20:49 +0200 Subject: test build wheels --- .github/workflows/build_wheels.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.github/workflows/build_wheels.yml') diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index be1719b..a4b980b 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -4,7 +4,7 @@ on: release: push: branches: - - "master" + - "**" jobs: build_wheels: @@ -39,7 +39,7 @@ jobs: - name: Build wheel env: - CIBW_SKIP: "pp*-win* pp*-macosx*" # remove pypy on mac and win (wrong version) + CIBW_SKIP: "pp*-win* pp*-macosx* cp2*" # remove pypy on mac and win (wrong version) CIBW_BEFORE_BUILD: "pip install numpy cython" run: | python -m cibuildwheel --output-dir wheelhouse -- cgit v1.2.3 From 43fcd147158d0cdf67f3bdc9a73716fdd5fac6be Mon Sep 17 00:00:00 2001 From: Rémi Flamary Date: Mon, 4 May 2020 15:33:33 +0200 Subject: remove whelels pypy --- .github/workflows/build_wheels.yml | 2 +- RELEASES.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to '.github/workflows/build_wheels.yml') diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index a4b980b..babe7fa 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -39,7 +39,7 @@ jobs: - name: Build wheel env: - CIBW_SKIP: "pp*-win* pp*-macosx* cp2*" # remove pypy on mac and win (wrong version) + CIBW_SKIP: "pp*-win* pp*-macosx* cp2* pp2*" # remove pypy on mac and win (wrong version) CIBW_BEFORE_BUILD: "pip install numpy cython" run: | python -m cibuildwheel --output-dir wheelhouse diff --git a/RELEASES.md b/RELEASES.md index 0fc9240..dbcb4cb 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -5,7 +5,7 @@ This is the new stable release for POT. We have a lot of changes in the documentation and several new features such as Partial OT, Unbalanced and Multi Sources OT Domain Adaptation and several bug fixes. One important change is that we have created a the GitHub organization [PythonOT](https://github.com/PythonOT) that now owns the main POT repository [https://github.com/PythonOT/POT](https://github.com/PythonOT/POT) and the repository for the new documentation hosted at [https://PythonOT.github.io/](https://PythonOT.github.io/). -This is the first release where the Python 2.7 tests have been removed. Most of the toolbox should still work but this is the last release where we release Python 2.7 wheels. +This is the first release where the Python 2.7 tests have been removed. Most of the toolbox should still work but we do not offer support for Python 2.7 and will close related Issues. A lot of changes have been done to the documentation that is now hosted on [https://PythonOT.github.io/](https://PythonOT.github.io/) instead of readthedocs. It was a hard choice but readthedocs did not allow us to run sphinx-gallery to update our beautiful examples and it was a huge amount of work to maintain it. The documentation is now automatically compiled and updated on merge. We also removed the notebooks from the repository for space reason and also because they are all available in the [example gallery](https://pythonot.github.io/auto_examples/index.html). Note that now the output of the documentation build for each commit in the PR is available to check that the doc builds correctly before merging which was not possible with readthedoc. -- cgit v1.2.3 From f0770af36cb2fef01156f3a30222eeace19a5352 Mon Sep 17 00:00:00 2001 From: Rémi Flamary Date: Mon, 4 May 2020 15:46:23 +0200 Subject: really remove pypy --- .github/workflows/build_wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows/build_wheels.yml') diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index babe7fa..7c61a06 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -39,7 +39,7 @@ jobs: - name: Build wheel env: - CIBW_SKIP: "pp*-win* pp*-macosx* cp2* pp2*" # remove pypy on mac and win (wrong version) + CIBW_SKIP: "pp*-win* pp*-macosx* cp2* pp*" # remove pypy on mac and win (wrong version) CIBW_BEFORE_BUILD: "pip install numpy cython" run: | python -m cibuildwheel --output-dir wheelhouse -- cgit v1.2.3 From ba752bdba9a6733ebbb835cdbc59f1195a849245 Mon Sep 17 00:00:00 2001 From: Rémi Flamary Date: Mon, 4 May 2020 16:06:22 +0200 Subject: back to build wheels on master --- .github/workflows/build_wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows/build_wheels.yml') diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 7c61a06..662a604 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -4,7 +4,7 @@ on: release: push: branches: - - "**" + - "master" jobs: build_wheels: -- cgit v1.2.3