From cf4a1aabed0ef919059b29f308436dbae21d1ad3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Flamary?= Date: Thu, 15 Apr 2021 14:03:45 +0200 Subject: [PATCH 01/16] add optional build wheels in PR --- .github/workflows/build_wheels_pr.yml | 51 +++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 .github/workflows/build_wheels_pr.yml diff --git a/.github/workflows/build_wheels_pr.yml b/.github/workflows/build_wheels_pr.yml new file mode 100644 index 000000000..c11536ace --- /dev/null +++ b/.github/workflows/build_wheels_pr.yml @@ -0,0 +1,51 @@ +name: Build dist and wheels in PR + +on: + release: + push: + branches: + - "*" + +jobs: + build_wheels_pr: + name: ${{ matrix.os }} + runs-on: ${{ matrix.os }} + if: "contains(github.event.head_commit.message, 'build wheels')" + strategy: + matrix: + os: [ubuntu-latest, macos-latest, windows-latest] + # macos-latest, windows-latest + + 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: | + 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.10.0 + + - name: Install Visual C++ for Python 2.7 + if: startsWith(matrix.os, 'windows') + run: | + choco install vcpython27 -f -y + + - name: Build wheel + env: + 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 + + - uses: actions/upload-artifact@v1 + with: + name: wheels + path: ./wheelhouse From e0241e7928741e5d8c725b6bfa47af1fdb2101c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Flamary?= Date: Thu, 15 Apr 2021 14:20:37 +0200 Subject: [PATCH 02/16] test if in build wheels --- .github/workflows/build_wheels.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 662a60495..d2cf88526 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -4,12 +4,14 @@ on: release: push: branches: - - "master" + - "*" jobs: build_wheels: name: ${{ matrix.os }} runs-on: ${{ matrix.os }} + if: "contains(github.event.head_commit.message, 'build wheels') || + github.event.branch == 'master' " strategy: matrix: os: [ubuntu-latest, macos-latest, windows-latest] From 5ad0121552553765df4d25a3d5801570878d6b61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Flamary?= Date: Thu, 15 Apr 2021 14:24:10 +0200 Subject: [PATCH 03/16] remove wheels builders --- .github/workflows/build_wheels.yml | 2 +- .github/workflows/build_wheels_pr.yml | 51 --------------------------- 2 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 .github/workflows/build_wheels_pr.yml diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index d2cf88526..e877aaaab 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -11,7 +11,7 @@ jobs: name: ${{ matrix.os }} runs-on: ${{ matrix.os }} if: "contains(github.event.head_commit.message, 'build wheels') || - github.event.branch == 'master' " + github.event.head_commit.branch == 'master' " strategy: matrix: os: [ubuntu-latest, macos-latest, windows-latest] diff --git a/.github/workflows/build_wheels_pr.yml b/.github/workflows/build_wheels_pr.yml deleted file mode 100644 index c11536ace..000000000 --- a/.github/workflows/build_wheels_pr.yml +++ /dev/null @@ -1,51 +0,0 @@ -name: Build dist and wheels in PR - -on: - release: - push: - branches: - - "*" - -jobs: - build_wheels_pr: - name: ${{ matrix.os }} - runs-on: ${{ matrix.os }} - if: "contains(github.event.head_commit.message, 'build wheels')" - strategy: - matrix: - os: [ubuntu-latest, macos-latest, windows-latest] - # macos-latest, windows-latest - - 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: | - 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.10.0 - - - name: Install Visual C++ for Python 2.7 - if: startsWith(matrix.os, 'windows') - run: | - choco install vcpython27 -f -y - - - name: Build wheel - env: - 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 - - - uses: actions/upload-artifact@v1 - with: - name: wheels - path: ./wheelhouse From 794cd7a087cc4a604ed2628afc2f35d19cb150a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Flamary?= Date: Thu, 15 Apr 2021 14:25:43 +0200 Subject: [PATCH 04/16] update build wheels et tets run --- .github/workflows/build_wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index e877aaaab..f779d934f 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -32,7 +32,7 @@ jobs: - name: Install cibuildwheel run: | - python -m pip install cibuildwheel==1.3.0 + python -m pip install cibuildwheel==1.10.0 - name: Install Visual C++ for Python 2.7 if: startsWith(matrix.os, 'windows') From 227c3fee1947d5213b59e42d1b64d49e4f3f114c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Flamary?= Date: Thu, 15 Apr 2021 16:17:59 +0200 Subject: [PATCH 05/16] add big sur --- .github/workflows/build_wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index f779d934f..188648502 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -14,7 +14,7 @@ jobs: github.event.head_commit.branch == 'master' " strategy: matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-latest, macos-latest, macos-11, windows-latest] # macos-latest, windows-latest steps: From 0e48c93301d747a10097500d627bbdae3d090385 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Flamary?= Date: Thu, 15 Apr 2021 16:27:10 +0200 Subject: [PATCH 06/16] add arm64 wheels and build wheels --- .github/workflows/build_wheels.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 188648502..9803a8156 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -39,10 +39,17 @@ jobs: run: | choco install vcpython27 -f -y + - name: Set up QEMU + if: runner.os == 'Linux' + uses: docker/setup-qemu-action@v1 + with: + platforms: all + - name: Build wheel env: CIBW_SKIP: "pp*-win* pp*-macosx* cp2* pp*" # remove pypy on mac and win (wrong version) CIBW_BEFORE_BUILD: "pip install numpy cython" + CIBW_ARCHS_LINUX: auto aarch64 run: | python -m cibuildwheel --output-dir wheelhouse From 9b52b9df95c65cfd33a9bec285ee3c3e6fe4f300 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Flamary?= Date: Thu, 15 Apr 2021 16:30:47 +0200 Subject: [PATCH 07/16] build wheels please --- .github/workflows/build_wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 9803a8156..418ff9510 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -49,7 +49,7 @@ jobs: env: CIBW_SKIP: "pp*-win* pp*-macosx* cp2* pp*" # remove pypy on mac and win (wrong version) CIBW_BEFORE_BUILD: "pip install numpy cython" - CIBW_ARCHS_LINUX: auto aarch64 + CIBW_ARCHS_LINUX: auto aarch64 # force aarch64 with QEMU run: | python -m cibuildwheel --output-dir wheelhouse From e2ef9c9f41ff596fb6b6aa082cfa6cd50a97c077 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Flamary?= Date: Thu, 15 Apr 2021 16:33:01 +0200 Subject: [PATCH 08/16] build wheels --- .github/workflows/build_wheels.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 418ff9510..33ba56091 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -15,7 +15,6 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest, macos-11, windows-latest] - # macos-latest, windows-latest steps: - uses: actions/checkout@v1 From fb2c9dea2b7211cd750e4b4b270bef8772ddbd2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Flamary?= Date: Thu, 15 Apr 2021 16:35:21 +0200 Subject: [PATCH 09/16] build wheels with proper file now --- .github/workflows/build_wheels.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 33ba56091..3afd163d2 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -10,8 +10,7 @@ jobs: build_wheels: name: ${{ matrix.os }} runs-on: ${{ matrix.os }} - if: "contains(github.event.head_commit.message, 'build wheels') || - github.event.head_commit.branch == 'master' " + if: "contains(github.event.head_commit.message, 'build wheels') || github.event.head_commit.branch == 'master' " strategy: matrix: os: [ubuntu-latest, macos-latest, macos-11, windows-latest] From e7fca8f405f05ae1afe170b434ad6995585cd4f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Flamary?= Date: Thu, 15 Apr 2021 16:36:39 +0200 Subject: [PATCH 10/16] build wheels debuged --- .github/workflows/build_wheels.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 3afd163d2..1c65ca3d7 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -38,10 +38,10 @@ jobs: choco install vcpython27 -f -y - name: Set up QEMU - if: runner.os == 'Linux' - uses: docker/setup-qemu-action@v1 - with: - platforms: all + if: runner.os == 'Linux' + uses: docker/setup-qemu-action@v1 + with: + platforms: all - name: Build wheel env: From 042523b296024ca85be525aa78589ba1916d60a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Flamary?= Date: Thu, 15 Apr 2021 16:37:37 +0200 Subject: [PATCH 11/16] remove big sur --- .github/workflows/build_wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 1c65ca3d7..07fdad935 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -13,7 +13,7 @@ jobs: if: "contains(github.event.head_commit.message, 'build wheels') || github.event.head_commit.branch == 'master' " strategy: matrix: - os: [ubuntu-latest, macos-latest, macos-11, windows-latest] + os: [ubuntu-latest, macos-latest, windows-latest] steps: - uses: actions/checkout@v1 From 08919818e80ecbc5eb3ff44270d702db5bc4178b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Flamary?= Date: Thu, 15 Apr 2021 16:38:02 +0200 Subject: [PATCH 12/16] build wheels debuged --- .github/workflows/build_wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 07fdad935..872748e9d 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -43,7 +43,7 @@ jobs: with: platforms: all - - name: Build wheel + - name: Build wheels env: CIBW_SKIP: "pp*-win* pp*-macosx* cp2* pp*" # remove pypy on mac and win (wrong version) CIBW_BEFORE_BUILD: "pip install numpy cython" From 883d94b3895dd5e5bc3a625e86f69592bf9f7331 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Flamary?= Date: Fri, 16 Apr 2021 13:39:58 +0200 Subject: [PATCH 13/16] add weekly build and test build wheels and build all wheels --- .github/workflows/build_wheels.yml | 44 ++++++++++++++++++ .github/workflows/build_wheels_weekly.yml | 54 +++++++++++++++++++++++ 2 files changed, 98 insertions(+) create mode 100644 .github/workflows/build_wheels_weekly.yml diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 872748e9d..e532da601 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -37,6 +37,49 @@ jobs: run: | choco install vcpython27 -f -y + - name: Build wheels + env: + 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 + + - uses: actions/upload-artifact@v1 + with: + name: wheels + path: ./wheelhouse + + + build_all_wheels: + name: ${{ matrix.os }} + runs-on: ${{ matrix.os }} + if: "contains(github.event.head_commit.message, 'build all wheels')" + strategy: + matrix: + os: [ubuntu-latest, macos-latest, windows-latest] + + 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: | + 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.10.0 + + - name: Install Visual C++ for Python 2.7 + if: startsWith(matrix.os, 'windows') + run: | + choco install vcpython27 -f -y + - name: Set up QEMU if: runner.os == 'Linux' uses: docker/setup-qemu-action@v1 @@ -55,3 +98,4 @@ jobs: with: name: wheels path: ./wheelhouse + diff --git a/.github/workflows/build_wheels_weekly.yml b/.github/workflows/build_wheels_weekly.yml new file mode 100644 index 000000000..4e3d3015f --- /dev/null +++ b/.github/workflows/build_wheels_weekly.yml @@ -0,0 +1,54 @@ +name: Build dist and wheels + +on: + schedule: + - cron: '30 0 * * 1' + +jobs: + build_wheels: + name: ${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest, macos-latest, windows-latest] + + 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: | + 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.10.0 + + - name: Install Visual C++ for Python 2.7 + if: startsWith(matrix.os, 'windows') + run: | + choco install vcpython27 -f -y + + - name: Set up QEMU + if: runner.os == 'Linux' + uses: docker/setup-qemu-action@v1 + with: + platforms: all + + - name: Build wheels + env: + CIBW_SKIP: "pp*-win* pp*-macosx* cp2* pp*" # remove pypy on mac and win (wrong version) + CIBW_BEFORE_BUILD: "pip install numpy cython" + CIBW_ARCHS_LINUX: auto aarch64 # force aarch64 with QEMU + run: | + python -m cibuildwheel --output-dir wheelhouse + + - uses: actions/upload-artifact@v1 + with: + name: wheels + path: ./wheelhouse From 816ffb1bf310626bda05d5d823d7f9d5a3cd6ff4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Flamary?= Date: Fri, 16 Apr 2021 13:41:52 +0200 Subject: [PATCH 14/16] whange name weekly build --- .github/workflows/build_wheels_weekly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_wheels_weekly.yml b/.github/workflows/build_wheels_weekly.yml index 4e3d3015f..361a163b4 100644 --- a/.github/workflows/build_wheels_weekly.yml +++ b/.github/workflows/build_wheels_weekly.yml @@ -1,4 +1,4 @@ -name: Build dist and wheels +name: Weekly build wheels on: schedule: From 71eb33389a61ebe0b50827ecaf590d06ee88e733 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Flamary?= Date: Fri, 16 Apr 2021 13:43:54 +0200 Subject: [PATCH 15/16] add potntial no ci and no pep8 flags --- .github/workflows/build_tests.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build_tests.yml b/.github/workflows/build_tests.yml index ad06a9dea..361af38b2 100644 --- a/.github/workflows/build_tests.yml +++ b/.github/workflows/build_tests.yml @@ -13,6 +13,7 @@ jobs: linux: runs-on: ubuntu-latest + if: "!contains(github.event.head_commit.message, 'no ci')" strategy: max-parallel: 4 matrix: @@ -41,6 +42,7 @@ jobs: pep8: runs-on: ubuntu-latest + if: "!contains(github.event.head_commit.message, 'no pep8')" strategy: max-parallel: 4 matrix: @@ -66,6 +68,7 @@ jobs: linux-minimal-deps: runs-on: ubuntu-latest + if: "!contains(github.event.head_commit.message, 'no ci')" strategy: max-parallel: 4 matrix: @@ -92,6 +95,7 @@ jobs: macos: runs-on: macos-latest + if: "!contains(github.event.head_commit.message, 'no ci')" strategy: max-parallel: 4 matrix: @@ -119,6 +123,7 @@ jobs: windows: runs-on: windows-2019 + if: "!contains(github.event.head_commit.message, 'no ci')" strategy: max-parallel: 4 matrix: From 7e8ec7dbcb6e5f58744ab6c713dd25977111ce24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Flamary?= Date: Fri, 16 Apr 2021 13:49:56 +0200 Subject: [PATCH 16/16] change name of actions --- .github/workflows/build_tests.yml | 5 ++--- .github/workflows/build_wheels.yml | 3 ++- .github/workflows/build_wheels_weekly.yml | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_tests.yml b/.github/workflows/build_tests.yml index 361af38b2..738fb21d7 100644 --- a/.github/workflows/build_tests.yml +++ b/.github/workflows/build_tests.yml @@ -1,8 +1,8 @@ -name: build +name: Build and test on: + workflow_dispatch: push: - create: branches: - 'master' @@ -120,7 +120,6 @@ jobs: python -m pytest -v test/ ot/ --doctest-modules --ignore ot/gpu/ --cov=ot - windows: runs-on: windows-2019 if: "!contains(github.event.head_commit.message, 'no ci')" diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index e532da601..b9f9f8d43 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -1,6 +1,7 @@ -name: Build dist and wheels +name: Build wheels on: + workflow_dispatch: release: push: branches: diff --git a/.github/workflows/build_wheels_weekly.yml b/.github/workflows/build_wheels_weekly.yml index 361a163b4..5691d8c0b 100644 --- a/.github/workflows/build_wheels_weekly.yml +++ b/.github/workflows/build_wheels_weekly.yml @@ -1,6 +1,7 @@ -name: Weekly build wheels +name: Build all wheels on: + workflow_dispatch: schedule: - cron: '30 0 * * 1'