From 24bacc3f39b361120cd7f38b54f8f05582d9931e Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Sat, 15 Oct 2022 04:51:12 -0400 Subject: [PATCH 1/4] migrate cibuildwheel configs to pyproject.toml --- .github/workflows/build_wheel.yml | 5 ----- pyproject.toml | 6 ++++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml index 6b749b64fd..f68cedaa32 100644 --- a/.github/workflows/build_wheel.yml +++ b/.github/workflows/build_wheel.yml @@ -26,11 +26,6 @@ jobs: python -m pip install cibuildwheel - name: Build wheels - env: - CIBW_BUILD: "cp36-* cp37-* cp38-* cp39-* cp310-*" - CIBW_MANYLINUX_X86_64_IMAGE: ghcr.io/deepmodeling/manylinux_2_28_x86_64_tensorflow - CIBW_BEFORE_BUILD: pip install tensorflow - CIBW_SKIP: "*-win32 *-manylinux_i686 *-musllinux*" run: | python -m cibuildwheel --output-dir wheelhouse - uses: actions/upload-artifact@v2 diff --git a/pyproject.toml b/pyproject.toml index 8d4bfad3eb..4dab07d65c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,3 +9,9 @@ requires = [ "ninja; platform_system!='Windows'", ] +[tool.cibuildwheel] +test-command = "dp -h" +build = ["cp36-*", "cp37-*", "cp38-*", "cp39-*", "cp310-*""] +skip = ["*-win32", "*-manylinux_i686", "*-musllinux*"] +manylinux-x86_64-image = "ghcr.io/deepmodeling/manylinux_2_28_x86_64_tensorflow" +before-build = "pip install tensorflow" From 186fa57b31ac113adac517e42c72803f06ca1bcc Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Sat, 15 Oct 2022 04:57:55 -0400 Subject: [PATCH 2/4] fix typo Signed-off-by: Jinzhe Zeng --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 4dab07d65c..2d0642ff19 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,7 +11,7 @@ requires = [ [tool.cibuildwheel] test-command = "dp -h" -build = ["cp36-*", "cp37-*", "cp38-*", "cp39-*", "cp310-*""] +build = ["cp36-*", "cp37-*", "cp38-*", "cp39-*", "cp310-*"] skip = ["*-win32", "*-manylinux_i686", "*-musllinux*"] manylinux-x86_64-image = "ghcr.io/deepmodeling/manylinux_2_28_x86_64_tensorflow" before-build = "pip install tensorflow" From 76846be51ecbf09d8d326a1f65dfded79eb7e5ab Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Sat, 15 Oct 2022 05:03:17 -0400 Subject: [PATCH 3/4] add test requires Signed-off-by: Jinzhe Zeng --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 2d0642ff19..387e971649 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,6 +11,7 @@ requires = [ [tool.cibuildwheel] test-command = "dp -h" +test-requires = "tensorflow" build = ["cp36-*", "cp37-*", "cp38-*", "cp39-*", "cp310-*"] skip = ["*-win32", "*-manylinux_i686", "*-musllinux*"] manylinux-x86_64-image = "ghcr.io/deepmodeling/manylinux_2_28_x86_64_tensorflow" From 079095a118966c9ca8081f91fff437d8a1278285 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Sat, 15 Oct 2022 05:18:06 -0400 Subject: [PATCH 4/4] before-build is not required Signed-off-by: Jinzhe Zeng --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 387e971649..238021e0ac 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,4 +15,3 @@ test-requires = "tensorflow" build = ["cp36-*", "cp37-*", "cp38-*", "cp39-*", "cp310-*"] skip = ["*-win32", "*-manylinux_i686", "*-musllinux*"] manylinux-x86_64-image = "ghcr.io/deepmodeling/manylinux_2_28_x86_64_tensorflow" -before-build = "pip install tensorflow"