Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Moved to using GitHub hosted macOS ARM build; fixed pip install timeout issue in CIs; ARM tests for python 3.8-3.12 #1

Merged
merged 22 commits into from
Feb 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/build_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -79,5 +79,3 @@ jobs:

- name: Heatmap computation unit test
run: cd ${{github.workspace}}/tests && python heatmap_generation_test.py


44 changes: 29 additions & 15 deletions .github/workflows/build_macos_arm.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,30 @@
name: Build macOS ARM

on:
push:
branches:
- '*'
pull_request:
branches: [master, release]
workflow_dispatch:

env:
MACOSX_DEPLOYMENT_TARGET: 11.0

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: python3 setup.py bdist_wheel --plat-name macosx_11_0_arm64

steps:
- uses: actions/checkout@v3
- name: Install dependencies
run: |
arch -arm64 brew reinstall zlib
run: arch -arm64 brew reinstall zlib

- name: Setup pyenv
env:
Expand All @@ -25,14 +37,14 @@ jobs:
PKG_CONFIG_PATH: "/usr/local/opt/zlib/lib/pkgconfig"
uses: "gabrielfalcao/pyenv-action@v13"
with:
default: 3.7
default: "3.8"
command: pip3 install -U pip3 wheel setuptools

- name: Collect submodules
uses: actions/checkout@v3
with:
submodules: 'recursive'

- name: Download ANTs
uses: robinraju/release-downloader@main
with:
Expand All @@ -43,12 +55,13 @@ 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/

- 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
Expand All @@ -61,30 +74,31 @@ 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", "3.11", "3.12"]
runs-on: ${{ matrix.os }}

steps:
- name: Setup pyenv for Python ${{ matrix.python-version }}
- name: Set up pyenv using Python ${{ matrix.python-version }}
uses: "gabrielfalcao/pyenv-action@v13"
with:
default: ${{ matrix.python-version }}
default: ${{ matrix.python-version }}
command: pip3 install -U pip3 wheel setuptools

- name: Download artifact
uses: actions/download-artifact@v3
with:
name: "Python wheel"

- name: Install wheel
run: pip3 install --force-reinstall --find-links=${{github.workspace}} raidionicsmaps-*
run: pip3 install --default-timeout=100 --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

2 changes: 1 addition & 1 deletion .github/workflows/build_ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified requirements.txt
Binary file not shown.
1 change: 0 additions & 1 deletion tests/heatmap_generation_test.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import os
import json
import shutil
import configparser
import logging
Expand Down
Loading