From e3530d024590ec5dad11843e69db5aa91b32b6c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Pedersen?= Date: Thu, 1 Feb 2024 19:08:54 +0100 Subject: [PATCH 01/22] Added ARM CI for macos-14 GitHub hosted --- .github/workflows/build_macos.yml | 2 - .github/workflows/build_macos_arm.yml | 73 ++++++++++++--------------- 2 files changed, 32 insertions(+), 43 deletions(-) diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml index 0ebacb2..ee68d5b 100644 --- a/.github/workflows/build_macos.yml +++ b/.github/workflows/build_macos.yml @@ -79,5 +79,3 @@ jobs: - name: Heatmap computation unit test run: cd ${{github.workspace}}/tests && python heatmap_generation_test.py - - diff --git a/.github/workflows/build_macos_arm.yml b/.github/workflows/build_macos_arm.yml index 61b4f21..31197fd 100644 --- a/.github/workflows/build_macos_arm.yml +++ b/.github/workflows/build_macos_arm.yml @@ -1,54 +1,45 @@ name: Build macOS ARM on: + push: + branches: + - '*' + pull_request: + branches: [master, release] workflow_dispatch: +env: + MACOSX_DEPLOYMENT_TARGET: 10.15 + jobs: build: - name: Build RADS lib on MacOS ARM - runs-on: self-hosted + runs-on: ${{ matrix.os }} + strategy: + matrix: + include: + - os: macos-14 + TARGET: macos + CMD_BUILD: python setup.py bdist_wheel --plat-name macosx_10_15_arm steps: - uses: actions/checkout@v3 - - name: Install dependencies - run: | - arch -arm64 brew reinstall zlib - - - name: Setup pyenv - env: - ACTIONS_ALLOW_UNSECURE_COMMANDS: true - MACOSX_DEPLOYMENT_TARGET: 11.0 - PYTHON_CONFIGURE_OPTS: "--enable-framework" - CFLAGS: "-Wno-implicit-function-declaration" - LDFLAGS: "-L/usr/local/opt/zlib/lib" - CPPFLAGS: "-I/usr/local/opt/zlib/include" - PKG_CONFIG_PATH: "/usr/local/opt/zlib/lib/pkgconfig" - uses: "gabrielfalcao/pyenv-action@v13" + - name: Set up Python 3.8 + uses: actions/setup-python@v4 with: - default: 3.7 - command: pip3 install -U pip3 wheel setuptools + python-version: "3.8" - name: Collect submodules uses: actions/checkout@v3 with: submodules: 'recursive' - - name: Download ANTs - uses: robinraju/release-downloader@main - with: - repository: "raidionics/Raidionics-dependencies" - latest: true - fileName: "ANTsX-v2.4.3_macos_arm.tar.gz" - out-file-path: "downloads" - - - name: Extract ANTs + - name: Install dependencies run: | - cd ${{github.workspace}}/downloads/ - tar -xzf ANTsX-v2.4.3_macos_arm.tar.gz -C ${{github.workspace}}/downloads/ - mv ${{github.workspace}}/downloads/install ${{github.workspace}}/raidionicsrads/ANTs/ + python -m pip install --upgrade pip + pip install wheel setuptools - - name: Building wheel for macOS ARM - run: python3 setup.py bdist_wheel --plat-name macosx_11_0_arm64 + - name: Built wheel for ${{matrix.TARGET}} + run: ${{matrix.CMD_BUILD}} - name: Upload Python wheel uses: actions/upload-artifact@v3 @@ -61,14 +52,15 @@ jobs: needs: build strategy: matrix: - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] - runs-on: self-hosted + os: [ macos-14 ] + python-version: ["3.8", "3.9", "3.10"] + runs-on: ${{ matrix.os }} steps: - - name: Setup pyenv for Python ${{ matrix.python-version }} - uses: "gabrielfalcao/pyenv-action@v13" + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 with: - default: ${{ matrix.python-version }} + python-version: ${{ matrix.python-version }} - name: Download artifact uses: actions/download-artifact@v3 @@ -76,15 +68,14 @@ jobs: name: "Python wheel" - name: Install wheel - run: pip3 install --force-reinstall --find-links=${{github.workspace}} raidionicsmaps-* + run: pip install --find-links=${{github.workspace}} raidionicsmaps-* shell: bash - name: Test CLI - run: python3 -m raidionicsmaps --help + run: raidionicsmaps --help - name: Clone repo uses: actions/checkout@v1 - name: Heatmap computation unit test - run: cd ${{github.workspace}}/tests && python3 heatmap_generation_test.py - + run: cd ${{github.workspace}}/tests && python heatmap_generation_test.py From d589bf18aa4db06a9ac07d3ab306a836ee35f70e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Pedersen?= Date: Thu, 1 Feb 2024 19:11:34 +0100 Subject: [PATCH 02/22] Build against Python 3.10, test 3.10-3.12 --- .github/workflows/build_macos_arm.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_macos_arm.yml b/.github/workflows/build_macos_arm.yml index 31197fd..b20f7b9 100644 --- a/.github/workflows/build_macos_arm.yml +++ b/.github/workflows/build_macos_arm.yml @@ -23,10 +23,10 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up Python 3.8 + - name: Set up Python 3.10 uses: actions/setup-python@v4 with: - python-version: "3.8" + python-version: "3.10" - name: Collect submodules uses: actions/checkout@v3 @@ -53,7 +53,7 @@ jobs: strategy: matrix: os: [ macos-14 ] - python-version: ["3.8", "3.9", "3.10"] + python-version: ["3.10", "3.11", "3.12"] runs-on: ${{ matrix.os }} steps: From 9183f87049ae7562493a436f81955fa9237e337f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Pedersen?= Date: Thu, 1 Feb 2024 19:18:26 +0100 Subject: [PATCH 03/22] Setup Python with pyenv in ARM CI --- .github/workflows/build_macos_arm.yml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_macos_arm.yml b/.github/workflows/build_macos_arm.yml index b20f7b9..5b09f58 100644 --- a/.github/workflows/build_macos_arm.yml +++ b/.github/workflows/build_macos_arm.yml @@ -23,10 +23,22 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up Python 3.10 - uses: actions/setup-python@v4 + - name: Install dependencies + run: arch -arm64 brew reinstall zlib + + - name: Setup pyenv + env: + ACTIONS_ALLOW_UNSECURE_COMMANDS: true + MACOSX_DEPLOYMENT_TARGET: 11.0 + PYTHON_CONFIGURE_OPTS: "--enable-framework" + CFLAGS: "-Wno-implicit-function-declaration" + LDFLAGS: "-L/usr/local/opt/zlib/lib" + CPPFLAGS: "-I/usr/local/opt/zlib/include" + PKG_CONFIG_PATH: "/usr/local/opt/zlib/lib/pkgconfig" + uses: "gabrielfalcao/pyenv-action@v13" with: - python-version: "3.10" + default: "3.10" + command: pip3 install -U pip3 wheel setuptools - name: Collect submodules uses: actions/checkout@v3 From 05ca77777e34d2a6c1b5e43aec5c3cd1ecc15d89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Pedersen?= Date: Thu, 1 Feb 2024 19:21:06 +0100 Subject: [PATCH 04/22] Use python3 not python for ARM CI --- .github/workflows/build_macos_arm.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_macos_arm.yml b/.github/workflows/build_macos_arm.yml index 5b09f58..4471ff2 100644 --- a/.github/workflows/build_macos_arm.yml +++ b/.github/workflows/build_macos_arm.yml @@ -19,7 +19,7 @@ jobs: include: - os: macos-14 TARGET: macos - CMD_BUILD: python setup.py bdist_wheel --plat-name macosx_10_15_arm + CMD_BUILD: python3 setup.py bdist_wheel --plat-name macosx_10_15_arm steps: - uses: actions/checkout@v3 @@ -47,7 +47,7 @@ jobs: - name: Install dependencies run: | - python -m pip install --upgrade pip + python3 -m pip install --upgrade pip pip install wheel setuptools - name: Built wheel for ${{matrix.TARGET}} @@ -90,4 +90,4 @@ jobs: uses: actions/checkout@v1 - name: Heatmap computation unit test - run: cd ${{github.workspace}}/tests && python heatmap_generation_test.py + run: cd ${{github.workspace}}/tests && python3 heatmap_generation_test.py From 88283dd1f5d1c806ba96be30e112d8aac695d3f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Pedersen?= Date: Thu, 1 Feb 2024 19:28:32 +0100 Subject: [PATCH 05/22] Build python whl for 11.0 --- .github/workflows/build_macos_arm.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_macos_arm.yml b/.github/workflows/build_macos_arm.yml index 4471ff2..669600a 100644 --- a/.github/workflows/build_macos_arm.yml +++ b/.github/workflows/build_macos_arm.yml @@ -9,7 +9,7 @@ on: workflow_dispatch: env: - MACOSX_DEPLOYMENT_TARGET: 10.15 + MACOSX_DEPLOYMENT_TARGET: 11.0 jobs: build: @@ -19,7 +19,7 @@ jobs: include: - os: macos-14 TARGET: macos - CMD_BUILD: python3 setup.py bdist_wheel --plat-name macosx_10_15_arm + CMD_BUILD: python3 setup.py bdist_wheel --plat-name macosx_11_0_arm steps: - uses: actions/checkout@v3 From 9ff152252814df20000b580b2ababf68180502c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Pedersen?= Date: Thu, 1 Feb 2024 19:31:15 +0100 Subject: [PATCH 06/22] Increase pip install timeout to 100s --- .github/workflows/build_macos.yml | 2 +- .github/workflows/build_macos_arm.yml | 2 +- .github/workflows/build_ubuntu.yml | 2 +- .github/workflows/build_windows.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml index ee68d5b..c9da1b9 100644 --- a/.github/workflows/build_macos.yml +++ b/.github/workflows/build_macos.yml @@ -68,7 +68,7 @@ jobs: name: "Python wheel" - name: Install wheel - run: pip install --find-links=${{github.workspace}} raidionicsmaps-* + run: pip install --default-timeout=100 --find-links=${{github.workspace}} raidionicsmaps-* shell: bash - name: Test CLI diff --git a/.github/workflows/build_macos_arm.yml b/.github/workflows/build_macos_arm.yml index 669600a..18f6967 100644 --- a/.github/workflows/build_macos_arm.yml +++ b/.github/workflows/build_macos_arm.yml @@ -80,7 +80,7 @@ jobs: name: "Python wheel" - name: Install wheel - run: pip install --find-links=${{github.workspace}} raidionicsmaps-* + run: pip install --default-timeout=100 --find-links=${{github.workspace}} raidionicsmaps-* shell: bash - name: Test CLI diff --git a/.github/workflows/build_ubuntu.yml b/.github/workflows/build_ubuntu.yml index 34bfebb..ab16752 100644 --- a/.github/workflows/build_ubuntu.yml +++ b/.github/workflows/build_ubuntu.yml @@ -64,7 +64,7 @@ jobs: name: "Python wheel" - name: Install wheel - run: pip install --find-links=${{github.workspace}} raidionicsmaps-* + run: pip install --default-timeout=100 --find-links=${{github.workspace}} raidionicsmaps-* shell: bash - name: Test CLI diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index 5538c19..166770b 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -64,7 +64,7 @@ jobs: name: "Python wheel" - name: Install wheel - run: pip install --find-links=. raidionicsmaps-* + run: pip install --default-timeout=100 --find-links=. raidionicsmaps-* shell: bash - name: Test CLI From 1beadb18d23f5d84fbb55f196133f7c12cbfb1f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Pedersen?= Date: Thu, 1 Feb 2024 19:41:26 +0100 Subject: [PATCH 07/22] Attempt to add export MACOSX_DEPLOYMENT_TARGET=11.0 before building whl --- .github/workflows/build_macos_arm.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_macos_arm.yml b/.github/workflows/build_macos_arm.yml index 18f6967..60df003 100644 --- a/.github/workflows/build_macos_arm.yml +++ b/.github/workflows/build_macos_arm.yml @@ -19,7 +19,7 @@ jobs: include: - os: macos-14 TARGET: macos - CMD_BUILD: python3 setup.py bdist_wheel --plat-name macosx_11_0_arm + CMD_BUILD: export MACOSX_DEPLOYMENT_TARGET=11.0 && python3 setup.py bdist_wheel --plat-name macosx_11_0_arm steps: - uses: actions/checkout@v3 @@ -38,7 +38,7 @@ jobs: uses: "gabrielfalcao/pyenv-action@v13" with: default: "3.10" - command: pip3 install -U pip3 wheel setuptools + command: export MACOSX_DEPLOYMENT_TARGET=11.0 && pip3 install -U pip3 wheel setuptools - name: Collect submodules uses: actions/checkout@v3 From 61a38b2a627dfd2b9a1a063519893057f027d4f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Pedersen?= Date: Thu, 1 Feb 2024 19:50:24 +0100 Subject: [PATCH 08/22] Attempt to build and test against 14.0 --- .github/workflows/build_macos_arm.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_macos_arm.yml b/.github/workflows/build_macos_arm.yml index 60df003..c567dc8 100644 --- a/.github/workflows/build_macos_arm.yml +++ b/.github/workflows/build_macos_arm.yml @@ -9,7 +9,7 @@ on: workflow_dispatch: env: - MACOSX_DEPLOYMENT_TARGET: 11.0 + MACOSX_DEPLOYMENT_TARGET: 14.0 jobs: build: @@ -19,7 +19,7 @@ jobs: include: - os: macos-14 TARGET: macos - CMD_BUILD: export MACOSX_DEPLOYMENT_TARGET=11.0 && python3 setup.py bdist_wheel --plat-name macosx_11_0_arm + CMD_BUILD: export MACOSX_DEPLOYMENT_TARGET=14.0 && python3 setup.py bdist_wheel --plat-name macosx_14_0_arm steps: - uses: actions/checkout@v3 @@ -29,7 +29,7 @@ jobs: - name: Setup pyenv env: ACTIONS_ALLOW_UNSECURE_COMMANDS: true - MACOSX_DEPLOYMENT_TARGET: 11.0 + MACOSX_DEPLOYMENT_TARGET: 14.0 PYTHON_CONFIGURE_OPTS: "--enable-framework" CFLAGS: "-Wno-implicit-function-declaration" LDFLAGS: "-L/usr/local/opt/zlib/lib" From f5c6d6f02bfd39c953018402d2a516f64dd83eaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Pedersen?= Date: Fri, 2 Feb 2024 09:04:37 +0100 Subject: [PATCH 09/22] Use arm64 in whl name not arm --- .github/workflows/build_macos_arm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_macos_arm.yml b/.github/workflows/build_macos_arm.yml index c567dc8..26fc7cc 100644 --- a/.github/workflows/build_macos_arm.yml +++ b/.github/workflows/build_macos_arm.yml @@ -19,7 +19,7 @@ jobs: include: - os: macos-14 TARGET: macos - CMD_BUILD: export MACOSX_DEPLOYMENT_TARGET=14.0 && python3 setup.py bdist_wheel --plat-name macosx_14_0_arm + CMD_BUILD: export MACOSX_DEPLOYMENT_TARGET=14.0 && python3 setup.py bdist_wheel --plat-name macosx_14_0_arm64 steps: - uses: actions/checkout@v3 From 01025868ebe41c4176c4488105080ca84ee20e13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Pedersen?= Date: Fri, 2 Feb 2024 09:08:05 +0100 Subject: [PATCH 10/22] Build against MACOSX_DEPLOYMENT_TARGET: 11.0 --- .github/workflows/build_macos_arm.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_macos_arm.yml b/.github/workflows/build_macos_arm.yml index 26fc7cc..f78a109 100644 --- a/.github/workflows/build_macos_arm.yml +++ b/.github/workflows/build_macos_arm.yml @@ -9,7 +9,7 @@ on: workflow_dispatch: env: - MACOSX_DEPLOYMENT_TARGET: 14.0 + MACOSX_DEPLOYMENT_TARGET: 11.0 jobs: build: @@ -19,7 +19,7 @@ jobs: include: - os: macos-14 TARGET: macos - CMD_BUILD: export MACOSX_DEPLOYMENT_TARGET=14.0 && python3 setup.py bdist_wheel --plat-name macosx_14_0_arm64 + CMD_BUILD: export MACOSX_DEPLOYMENT_TARGET=14.0 && python3 setup.py bdist_wheel --plat-name macosx_11_0_arm64 steps: - uses: actions/checkout@v3 @@ -29,7 +29,7 @@ jobs: - name: Setup pyenv env: ACTIONS_ALLOW_UNSECURE_COMMANDS: true - MACOSX_DEPLOYMENT_TARGET: 14.0 + MACOSX_DEPLOYMENT_TARGET: 11.0 PYTHON_CONFIGURE_OPTS: "--enable-framework" CFLAGS: "-Wno-implicit-function-declaration" LDFLAGS: "-L/usr/local/opt/zlib/lib" @@ -65,7 +65,7 @@ jobs: strategy: matrix: os: [ macos-14 ] - python-version: ["3.10", "3.11", "3.12"] + python-version: ["3.10"] runs-on: ${{ matrix.os }} steps: From 46c4e3b38020284a3a816f3683e78f2bfa366814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Pedersen?= Date: Fri, 2 Feb 2024 09:08:32 +0100 Subject: [PATCH 11/22] Remove export likely no longer needed --- .github/workflows/build_macos_arm.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_macos_arm.yml b/.github/workflows/build_macos_arm.yml index f78a109..001d344 100644 --- a/.github/workflows/build_macos_arm.yml +++ b/.github/workflows/build_macos_arm.yml @@ -19,7 +19,7 @@ jobs: include: - os: macos-14 TARGET: macos - CMD_BUILD: export MACOSX_DEPLOYMENT_TARGET=14.0 && python3 setup.py bdist_wheel --plat-name macosx_11_0_arm64 + CMD_BUILD: python3 setup.py bdist_wheel --plat-name macosx_11_0_arm64 steps: - uses: actions/checkout@v3 @@ -38,7 +38,7 @@ jobs: uses: "gabrielfalcao/pyenv-action@v13" with: default: "3.10" - command: export MACOSX_DEPLOYMENT_TARGET=11.0 && pip3 install -U pip3 wheel setuptools + command: pip3 install -U pip3 wheel setuptools - name: Collect submodules uses: actions/checkout@v3 From 2c6e2b17a06285d9627ab08785b65cc0eab304d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Pedersen?= Date: Fri, 2 Feb 2024 09:15:11 +0100 Subject: [PATCH 12/22] Added missing scikit-image hidden dep --- requirements.txt | Bin 38 -> 66 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/requirements.txt b/requirements.txt index 6d316bfe4d26d9df310e751250c574104c8f8afa..6c381ea8116971a3b3c3485e9569fe26ea769584 100644 GIT binary patch delta 33 lcmY#$nxH1b#Zb(U%#g{D4a6l3xl9y From 8c0120ff1beb5f49f66a408b0b15fa2156497f74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Pedersen?= Date: Fri, 2 Feb 2024 09:18:02 +0100 Subject: [PATCH 13/22] Build ARM against macos-12 and Python 3.8 --- .github/workflows/build_macos_arm.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_macos_arm.yml b/.github/workflows/build_macos_arm.yml index 001d344..f222905 100644 --- a/.github/workflows/build_macos_arm.yml +++ b/.github/workflows/build_macos_arm.yml @@ -17,7 +17,7 @@ jobs: strategy: matrix: include: - - os: macos-14 + - os: macos-12 TARGET: macos CMD_BUILD: python3 setup.py bdist_wheel --plat-name macosx_11_0_arm64 @@ -37,7 +37,7 @@ jobs: PKG_CONFIG_PATH: "/usr/local/opt/zlib/lib/pkgconfig" uses: "gabrielfalcao/pyenv-action@v13" with: - default: "3.10" + default: "3.8" command: pip3 install -U pip3 wheel setuptools - name: Collect submodules @@ -64,8 +64,8 @@ jobs: needs: build strategy: matrix: - os: [ macos-14 ] - python-version: ["3.10"] + os: [ macos-12 ] + python-version: ["3.8", "3.9", "3.10"] runs-on: ${{ matrix.os }} steps: From f86d8d09c2f47fa4dd6855bc399d02a269e30381 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Pedersen?= Date: Fri, 2 Feb 2024 09:20:04 +0100 Subject: [PATCH 14/22] Build against macos-14 but using Python 3.8 --- .github/workflows/build_macos_arm.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_macos_arm.yml b/.github/workflows/build_macos_arm.yml index f222905..b87e56a 100644 --- a/.github/workflows/build_macos_arm.yml +++ b/.github/workflows/build_macos_arm.yml @@ -17,7 +17,7 @@ jobs: strategy: matrix: include: - - os: macos-12 + - os: macos-14 TARGET: macos CMD_BUILD: python3 setup.py bdist_wheel --plat-name macosx_11_0_arm64 @@ -64,7 +64,7 @@ jobs: needs: build strategy: matrix: - os: [ macos-12 ] + os: [ macos-14 ] python-version: ["3.8", "3.9", "3.10"] runs-on: ${{ matrix.os }} From febfa88d199c9acf4b509916de46cbdcebda9c18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Pedersen?= Date: Fri, 2 Feb 2024 09:27:57 +0100 Subject: [PATCH 15/22] Build against 3.10, test 3.10-3.12 --- .github/workflows/build_macos_arm.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_macos_arm.yml b/.github/workflows/build_macos_arm.yml index b87e56a..c213d59 100644 --- a/.github/workflows/build_macos_arm.yml +++ b/.github/workflows/build_macos_arm.yml @@ -37,7 +37,7 @@ jobs: PKG_CONFIG_PATH: "/usr/local/opt/zlib/lib/pkgconfig" uses: "gabrielfalcao/pyenv-action@v13" with: - default: "3.8" + default: "3.10" command: pip3 install -U pip3 wheel setuptools - name: Collect submodules @@ -65,7 +65,7 @@ jobs: strategy: matrix: os: [ macos-14 ] - python-version: ["3.8", "3.9", "3.10"] + python-version: ["3.10", "3.11", "3.12"] runs-on: ${{ matrix.os }} steps: From 50a2c944a66c2ad0513b8fae852c7b8f48afb4bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Pedersen?= Date: Fri, 2 Feb 2024 09:31:03 +0100 Subject: [PATCH 16/22] Use pyenv for tests, test with 3.8-3.12 --- .github/workflows/build_macos_arm.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_macos_arm.yml b/.github/workflows/build_macos_arm.yml index c213d59..c9e0538 100644 --- a/.github/workflows/build_macos_arm.yml +++ b/.github/workflows/build_macos_arm.yml @@ -37,7 +37,7 @@ jobs: PKG_CONFIG_PATH: "/usr/local/opt/zlib/lib/pkgconfig" uses: "gabrielfalcao/pyenv-action@v13" with: - default: "3.10" + default: "3.8" command: pip3 install -U pip3 wheel setuptools - name: Collect submodules @@ -65,14 +65,15 @@ jobs: strategy: matrix: os: [ macos-14 ] - python-version: ["3.10", "3.11", "3.12"] + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] runs-on: ${{ matrix.os }} steps: - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + - name: Set up pyenv using Python ${{ matrix.python-version }} + uses: "gabrielfalcao/pyenv-action@v13" with: - python-version: ${{ matrix.python-version }} + default: ${{ matrix.python-version }} + command: pip3 install -U pip3 wheel setuptools - name: Download artifact uses: actions/download-artifact@v3 From 37c06a72e6010072a2d06f7c87d8b18ba9c4336e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Pedersen?= Date: Fri, 2 Feb 2024 09:34:03 +0100 Subject: [PATCH 17/22] Install pip for tests in ARM64 --- .github/workflows/build_macos_arm.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_macos_arm.yml b/.github/workflows/build_macos_arm.yml index c9e0538..6967f41 100644 --- a/.github/workflows/build_macos_arm.yml +++ b/.github/workflows/build_macos_arm.yml @@ -73,7 +73,9 @@ jobs: uses: "gabrielfalcao/pyenv-action@v13" with: default: ${{ matrix.python-version }} - command: pip3 install -U pip3 wheel setuptools + command: | + python3 -m pip install --upgrade pip + pip install wheel setuptools - name: Download artifact uses: actions/download-artifact@v3 From 3d088a5efc05e7ca78e32648ecf3e7ab4f87206b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Pedersen?= Date: Fri, 2 Feb 2024 09:41:23 +0100 Subject: [PATCH 18/22] Attempt to fix pip in ARM build --- .github/workflows/build_macos_arm.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build_macos_arm.yml b/.github/workflows/build_macos_arm.yml index 6967f41..c9e0538 100644 --- a/.github/workflows/build_macos_arm.yml +++ b/.github/workflows/build_macos_arm.yml @@ -73,9 +73,7 @@ jobs: uses: "gabrielfalcao/pyenv-action@v13" with: default: ${{ matrix.python-version }} - command: | - python3 -m pip install --upgrade pip - pip install wheel setuptools + command: pip3 install -U pip3 wheel setuptools - name: Download artifact uses: actions/download-artifact@v3 From 9a51352e243614541f9d446e4f5b2c74d126fe28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Pedersen?= Date: Fri, 2 Feb 2024 09:58:53 +0100 Subject: [PATCH 19/22] Use pip3 in tests for ARM --- .github/workflows/build_macos_arm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_macos_arm.yml b/.github/workflows/build_macos_arm.yml index c9e0538..4f2d4e4 100644 --- a/.github/workflows/build_macos_arm.yml +++ b/.github/workflows/build_macos_arm.yml @@ -81,7 +81,7 @@ jobs: name: "Python wheel" - name: Install wheel - run: pip install --default-timeout=100 --find-links=${{github.workspace}} raidionicsmaps-* + run: pip3 install --default-timeout=100 --find-links=${{github.workspace}} raidionicsmaps-* shell: bash - name: Test CLI From eedeabb288a0cc780b94242c95b02a3bbc79ed06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Pedersen?= Date: Fri, 2 Feb 2024 10:20:28 +0100 Subject: [PATCH 20/22] Removed redundant JSON import --- tests/heatmap_generation_test.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/heatmap_generation_test.py b/tests/heatmap_generation_test.py index 471123d..e687e21 100644 --- a/tests/heatmap_generation_test.py +++ b/tests/heatmap_generation_test.py @@ -1,5 +1,4 @@ import os -import json import shutil import configparser import logging From 82b98840e59e0b69ae0e68f2be729724d8fc4778 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Pedersen?= Date: Fri, 2 Feb 2024 14:20:07 +0100 Subject: [PATCH 21/22] Fixed ANTs build in ARM --- .github/workflows/build_macos_arm.yml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_macos_arm.yml b/.github/workflows/build_macos_arm.yml index 4f2d4e4..7239f3e 100644 --- a/.github/workflows/build_macos_arm.yml +++ b/.github/workflows/build_macos_arm.yml @@ -44,11 +44,20 @@ jobs: uses: actions/checkout@v3 with: submodules: 'recursive' + + - name: Download ANTs + uses: robinraju/release-downloader@main + with: + repository: "raidionics/Raidionics-dependencies" + latest: true + fileName: "ANTsX-v2.4.3_macos_arm.tar.gz" + out-file-path: "downloads" - - name: Install dependencies + - name: Extract ANTs run: | - python3 -m pip install --upgrade pip - pip install wheel setuptools + cd ${{github.workspace}}/downloads/ + tar -xzf ANTsX-v2.4.3_macos_arm.tar.gz -C ${{github.workspace}}/downloads/ + mv ${{github.workspace}}/downloads/install ${{github.workspace}}/raidionicsrads/ANTs/ - name: Built wheel for ${{matrix.TARGET}} run: ${{matrix.CMD_BUILD}} From eebf4639503c3bfb9b8146e1e9f588ad1c11c9c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Pedersen?= Date: Fri, 2 Feb 2024 14:24:17 +0100 Subject: [PATCH 22/22] Fixed path in ANTs build --- .github/workflows/build_macos_arm.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_macos_arm.yml b/.github/workflows/build_macos_arm.yml index 7239f3e..e482d0f 100644 --- a/.github/workflows/build_macos_arm.yml +++ b/.github/workflows/build_macos_arm.yml @@ -55,6 +55,7 @@ jobs: - name: Extract ANTs run: | + mkdir -p ${{github.workspace}}/raidionicsrads/ANTs/ cd ${{github.workspace}}/downloads/ tar -xzf ANTsX-v2.4.3_macos_arm.tar.gz -C ${{github.workspace}}/downloads/ mv ${{github.workspace}}/downloads/install ${{github.workspace}}/raidionicsrads/ANTs/