From bc1d66fedbde6eefc54fff401f68dfd315a80544 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rennfanz=2C=20Bj=C3=B6rn?= Date: Wed, 8 Nov 2023 13:04:19 +0100 Subject: [PATCH] Some adjustments to windows github actions pipeline, adjusting arch value for windows platforms. --- .github/workflows/main.yml | 9 +++++---- pyproject.toml | 10 +++++----- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7e6637e..b51b6df 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -147,14 +147,14 @@ jobs: - name: Setup pylon run: | - # install pylon cd pylon-installer basler_pylon_7_4_0_14900.exe /quiet /install="GigE_Support;USB_Support;Camera_Link_Support;CoaXPress_Support;GenTL_Consumer_Support;CamEmu_Support;SDKs;DataProcessing_SDK" + shell: cmd - name: Build wheels uses: pypa/cibuildwheel@v2.13.0 env: - PYLON_DEV_DIR: "C:\Program Files\Basler\pylon 7\Development" + PYLON_DEV_DIR: "C:\\Program Files\\Basler\\pylon 7\\Development" - uses: actions/upload-artifact@v3 with: @@ -171,8 +171,9 @@ jobs: - name: Publish package to (Test)PyPI if: needs.prepare.outputs.is_release_build == 'true' run: | - sudo pip install twine - python -m twine upload --non-interactive --skip-existing wheelhouse/* + python -m pip install twine + python -m twine upload --non-interactive --skip-existing wheelhouse\\* + shell: cmd build-macos: diff --git a/pyproject.toml b/pyproject.toml index 31f23b0..8d29709 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,13 +3,13 @@ requires = ["setuptools>=42", "swig>=4.0", "wheel"] build-backend = "setuptools.build_meta" [tool.cibuildwheel] -build-verbosity = "0" -archs = "x86_64 arm64" -build = "*-macosx_*" skip = "pp*" +build-verbosity = "0" test-requires = "pytest numpy" [tool.cibuildwheel.windows] +archs = "AMD64" +build = "*-win_*" before-all = 'echo "Building: %CIBW_BUILD%"' test-command = [ ''' @@ -18,6 +18,8 @@ test-command = [ ] [tool.cibuildwheel.macos] +archs = "x86_64 arm64" +build = "*-macosx_*" before-all = 'echo "Building: $CIBW_BUILD"' repair-wheel-command = "" test-command = [ @@ -26,7 +28,6 @@ test-command = [ ''' ] - [[tool.cibuildwheel.overrides]] select = "*-macosx_arm64" before-build = [ @@ -52,4 +53,3 @@ before-build = [ ''' ] environment = { SYSTEM_VERSION_COMPAT="0",PYLON_FRAMEWORK_LOCATION="${PYLON_FRAMEWORK_X86_64}",MACOSX_DEPLOYMENT_TARGET="11.0" } -