From 65fe9faae4f77f66473d7ba9943bd390835d1720 Mon Sep 17 00:00:00 2001 From: Andreas Fehlner Date: Fri, 14 Mar 2025 18:19:40 +0100 Subject: [PATCH 1/5] Update setup.py Signed-off-by: Andreas Fehlner --- setup.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 681077b33..3988c7509 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ import re from textwrap import dedent import multiprocessing - +import shutil TOP_DIR = os.path.realpath(os.path.dirname(__file__)) SRC_DIR = os.path.join(TOP_DIR, 'onnxoptimizer') @@ -32,7 +32,8 @@ WINDOWS = (os.name == 'nt') MACOS = sys.platform.startswith("darwin") -CMAKE = find_executable('cmake') +CMAKE = shutil.which('cmake') + install_requires = [] setup_requires = [] From 815db28e77af4ffe9a7f722e9ce1302d9b815e00 Mon Sep 17 00:00:00 2001 From: Andreas Fehlner Date: Fri, 14 Mar 2025 18:25:46 +0100 Subject: [PATCH 2/5] update Signed-off-by: Andreas Fehlner --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 288d5e750..27315016d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -8,7 +8,7 @@ addopts = --nbval --current-env testpaths = onnxoptimizer/test/ [metadata] -license-file = LICENSE +license_file = LICENSE [flake8] select = B,C,E,F,P,T4,W,B9 From e69810c8daac6d118ad264df35fa37d3feea8781 Mon Sep 17 00:00:00 2001 From: Andreas Fehlner Date: Fri, 14 Mar 2025 18:32:48 +0100 Subject: [PATCH 3/5] Update setup.cfg Signed-off-by: Andreas Fehlner --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 27315016d..9197bee57 100644 --- a/setup.cfg +++ b/setup.cfg @@ -8,7 +8,7 @@ addopts = --nbval --current-env testpaths = onnxoptimizer/test/ [metadata] -license_file = LICENSE +license_files = LICENSE [flake8] select = B,C,E,F,P,T4,W,B9 From 34cab4a605c4bb98ddb4c2ba5d4984c5a26d3387 Mon Sep 17 00:00:00 2001 From: Andreas Fehlner Date: Fri, 14 Mar 2025 18:52:30 +0100 Subject: [PATCH 4/5] update --- .github/workflows/build-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 021f8ff25..eefe461b8 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -7,7 +7,7 @@ jobs: env: CIBW_ARCHS_MACOS: x86_64 universal2 CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014 - CIBW_BEFORE_ALL_LINUX: WD=`pwd` && /opt/python/cp38-cp38/bin/python -m pip install --target tmp_cmake cmake && cp tmp_cmake/bin/cmake /usr/local/bin/cmake && rm -rf tmp_cmake && /opt/python/cp38-cp38/bin/python -m pip install cmake && cmake --version && whereis cmake + CIBW_BEFORE_ALL_LINUX: WD=`pwd` && /opt/python/cp38-cp38/bin/python -m pip install --target tmp_cmake cmake && cp tmp_cmake/bin/cmake /usr/local/bin/cmake && rm -rf tmp_cmake && /opt/python/cp39-cp39/bin/python -m pip install cmake && cmake --version && whereis cmake CIBW_BEFORE_ALL_MACOS: WD=`pwd` && pip install cmake CIBW_TEST_REQUIRES_LINUX: pytest nbval flake8 mypy onnxruntime CIBW_TEST_REQUIRES_MACOS: pytest nbval From b792cd115d98f0082e56a3e6173a78fdec934d1b Mon Sep 17 00:00:00 2001 From: Andreas Fehlner Date: Sat, 15 Mar 2025 06:50:30 +0100 Subject: [PATCH 5/5] Update build-and-test.yml Signed-off-by: Andreas Fehlner --- .github/workflows/build-and-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index eefe461b8..f4b05559a 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -26,6 +26,7 @@ jobs: name: Build wheels on ${{ matrix.os }} runs-on: ${{ matrix.os }} strategy: + fail-fast: false matrix: os: [ubuntu-22.04, windows-2019, macos-10.15] steps: