From 5fc704c894d5aeaef8abc7479ba0dd14ba430f68 Mon Sep 17 00:00:00 2001 From: Gene Hoffman Date: Sat, 8 Jan 2022 14:44:18 -0800 Subject: [PATCH 01/12] Build Python 3.9 and 3.10 M1 wheels --- .github/workflows/build-m1-wheel.yml | 45 ++++++++++++++++++---------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build-m1-wheel.yml b/.github/workflows/build-m1-wheel.yml index b178b71cf..b93862bb9 100644 --- a/.github/workflows/build-m1-wheel.yml +++ b/.github/workflows/build-m1-wheel.yml @@ -29,29 +29,44 @@ jobs: with: fetch-depth: 0 - - name: Lint source with flake8 + - name: Brew update Python run: | - arch -arm64 python -m pip install --upgrade pip - arch -arm64 pip install flake8 - arch -arm64 flake8 src setup.py python-bindings python-impl + arch -arm64 brew upgrade python@3.9 + arch -arm64 brew upgrade python@3.10 - - name: Lint source with mypy + - name: Build m1 wheels for 3.9 and 3.10 run: | - arch -arm64 pip install mypy - arch -arm64 mypy --config-file mypi.ini python-bindings python-impl - - - name: Build m1 wheels - run: | - arch -arm64 pip wheel -w dist --no-deps . - arch -arm64 delocate-wheel -v dist/*.whl + rm -rf venv + arch -arm64 /usr/local/opt/python@3.9/libexec/bin/python -m venv venv + arch -arm64 source venv/bin/activate + arch -arm64 /usr/local/opt/python@3.9/libexec/bin/pip wheel -w dist --no-deps . + arch -arm64 delocate-wheel -v dist/*cp39*.whl + deactivate + rm -rf venv + arch -arm64 /usr/local/opt/python@3.10/libexec/bin/python -m venv venv + arch -arm64 source venv/bin/activate + arch -arm64 /usr/local/opt/python@3.10/libexec/bin/pip wheel -w dist --no-deps . + arch -arm64 delocate-wheel -v dist/*cp310*.whl + deactivate + rm -rf venv - name: Test wheel run: | - arch -arm64 python3 -m venv venv - . ./venv/bin/activate - arch -arm64 pip install ./dist/*.whl + rm -rf venv + arch -arm64 /usr/local/opt/python@3.9/libexec/bin/python -m venv venv + arch -arm64 source venv/bin/activate + arch -arm64 pip install ./dist/*cp-39*.whl + arch -arm64 pip install pytest + arch -arm64 ./venv/bin/pytest -v ./python-bindings/test.py + deactivate + rm -rf venv + arch -arm64 /usr/local/opt/python@3.10/libexec/bin/python -m venv venv + arch -arm64 source venv/bin/activate + arch -arm64 pip install ./dist/*cp-310*.whl arch -arm64 pip install pytest arch -arm64 ./venv/bin/pytest -v ./python-bindings/test.py + deactivate + rm -rf venv - name: Create sha256 hash run: | From 435c199963c1735ad1dad486c5577647e76737f9 Mon Sep 17 00:00:00 2001 From: Gene Hoffman Date: Sat, 8 Jan 2022 14:46:06 -0800 Subject: [PATCH 02/12] Find brew-python paths --- .github/workflows/build-m1-wheel.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-m1-wheel.yml b/.github/workflows/build-m1-wheel.yml index b93862bb9..2940175dd 100644 --- a/.github/workflows/build-m1-wheel.yml +++ b/.github/workflows/build-m1-wheel.yml @@ -33,6 +33,8 @@ jobs: run: | arch -arm64 brew upgrade python@3.9 arch -arm64 brew upgrade python@3.10 + arch -arm64 brew info python@3.9 + arch -arm64 brew info python@3.10 - name: Build m1 wheels for 3.9 and 3.10 run: | From 2a7c26ee31cf7d0595f4b6897641ee997ede6930 Mon Sep 17 00:00:00 2001 From: Gene Hoffman <30377676+hoffmang9@users.noreply.github.com> Date: Sat, 8 Jan 2022 14:50:24 -0800 Subject: [PATCH 03/12] Cancel-workflow to 0.9.1 - test Python 3.10 on Mac/Ubuntu (#303) * cancel-workflow to 0.9.1 - test Python 3.10 * Revert e73751e and change to single \ later --- .github/workflows/build-aarch64.yml | 2 +- .github/workflows/build-m1-wheel.yml | 2 +- .github/workflows/build-test.yaml | 8 ++++---- .github/workflows/build-wheels.yml | 2 +- .github/workflows/relic-nightly.yml | 2 +- setup.py | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-aarch64.yml b/.github/workflows/build-aarch64.yml index c309f1bab..b33d845ad 100644 --- a/.github/workflows/build-aarch64.yml +++ b/.github/workflows/build-aarch64.yml @@ -22,7 +22,7 @@ jobs: steps: - name: Cancel previous runs on the same branch if: ${{ github.ref != 'refs/heads/main' }} - uses: styfle/cancel-workflow-action@0.7.0 + uses: styfle/cancel-workflow-action@0.9.1 with: access_token: ${{ github.token }} diff --git a/.github/workflows/build-m1-wheel.yml b/.github/workflows/build-m1-wheel.yml index 2940175dd..c81094a51 100644 --- a/.github/workflows/build-m1-wheel.yml +++ b/.github/workflows/build-m1-wheel.yml @@ -20,7 +20,7 @@ jobs: steps: - name: Cancel previous runs on the same branch if: ${{ github.ref != 'refs/heads/main' }} - uses: styfle/cancel-workflow-action@0.7.0 + uses: styfle/cancel-workflow-action@0.9.1 with: access_token: ${{ github.token }} diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml index 58b1a0743..5ed10d903 100644 --- a/.github/workflows/build-test.yaml +++ b/.github/workflows/build-test.yaml @@ -18,12 +18,12 @@ jobs: fail-fast: false matrix: os: [macos-latest, ubuntu-latest] - python: ['3.7', '3.8', '3.9'] + python: ['3.7', '3.8', '3.9', '3.10'] steps: - name: Cancel previous runs on the same branch if: ${{ github.ref != 'refs/heads/main' }} - uses: styfle/cancel-workflow-action@0.7.0 + uses: styfle/cancel-workflow-action@0.9.1 with: access_token: ${{ github.token }} @@ -69,10 +69,10 @@ jobs: - name: Test pure python implementation run: | python python-impl/impl-test.py - + - name: Install emsdk uses: mymindstorm/setup-emsdk@v9 - + - name: Test javascript bindings run: | emcc -v diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml index 9512680ca..9f9806002 100644 --- a/.github/workflows/build-wheels.yml +++ b/.github/workflows/build-wheels.yml @@ -22,7 +22,7 @@ jobs: steps: - name: Cancel previous runs on the same branch if: ${{ github.ref != 'refs/heads/main' }} - uses: styfle/cancel-workflow-action@0.7.0 + uses: styfle/cancel-workflow-action@0.9.1 with: access_token: ${{ github.token }} diff --git a/.github/workflows/relic-nightly.yml b/.github/workflows/relic-nightly.yml index c75972d31..cc8c032a4 100644 --- a/.github/workflows/relic-nightly.yml +++ b/.github/workflows/relic-nightly.yml @@ -17,7 +17,7 @@ jobs: steps: - name: Cancel previous runs on the same branch if: ${{ github.ref != 'refs/heads/main' }} - uses: styfle/cancel-workflow-action@0.7.0 + uses: styfle/cancel-workflow-action@0.9.1 with: access_token: ${{ github.token }} diff --git a/setup.py b/setup.py index 1b0d7b2b1..4d2482b9d 100644 --- a/setup.py +++ b/setup.py @@ -176,7 +176,7 @@ def build_extensions(self): opts.append("-fvisibility=hidden") elif ct == "msvc": if sys.version_info < (3, 9): - ver_flag = '/DVERSION_INFO=\\"%s\\"' + ver_flag = '/DVERSION_INFO=\"%s\"' else: ver_flag = '-DVERSION_INFO="%s"' opts.append(ver_flag % self.distribution.get_version()) From 80302915fab2990fcb2bf66c0de8cf70498cd773 Mon Sep 17 00:00:00 2001 From: Gene Hoffman Date: Sat, 8 Jan 2022 15:01:11 -0800 Subject: [PATCH 04/12] python is in /opt/homebrew --- .github/workflows/build-m1-wheel.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-m1-wheel.yml b/.github/workflows/build-m1-wheel.yml index c81094a51..16fa9bc48 100644 --- a/.github/workflows/build-m1-wheel.yml +++ b/.github/workflows/build-m1-wheel.yml @@ -39,15 +39,15 @@ jobs: - name: Build m1 wheels for 3.9 and 3.10 run: | rm -rf venv - arch -arm64 /usr/local/opt/python@3.9/libexec/bin/python -m venv venv + arch -arm64 /opt/homebrew/opt/python@3.9/libexec/bin/python -m venv venv arch -arm64 source venv/bin/activate - arch -arm64 /usr/local/opt/python@3.9/libexec/bin/pip wheel -w dist --no-deps . + arch -arm64 /opt/homebrew/opt/python@3.9/libexec/bin/pip wheel -w dist --no-deps . arch -arm64 delocate-wheel -v dist/*cp39*.whl deactivate rm -rf venv - arch -arm64 /usr/local/opt/python@3.10/libexec/bin/python -m venv venv + arch -arm64 /opt/homebrew/opt/python@3.10/libexec/bin/python -m venv venv arch -arm64 source venv/bin/activate - arch -arm64 /usr/local/opt/python@3.10/libexec/bin/pip wheel -w dist --no-deps . + arch -arm64 /opt/homebrew/opt/python@3.10/libexec/bin/pip wheel -w dist --no-deps . arch -arm64 delocate-wheel -v dist/*cp310*.whl deactivate rm -rf venv @@ -55,14 +55,14 @@ jobs: - name: Test wheel run: | rm -rf venv - arch -arm64 /usr/local/opt/python@3.9/libexec/bin/python -m venv venv + arch -arm64 /opt/homebrew/opt/python@3.9/libexec/bin/python -m venv venv arch -arm64 source venv/bin/activate arch -arm64 pip install ./dist/*cp-39*.whl arch -arm64 pip install pytest arch -arm64 ./venv/bin/pytest -v ./python-bindings/test.py deactivate rm -rf venv - arch -arm64 /usr/local/opt/python@3.10/libexec/bin/python -m venv venv + arch -arm64 /opt/homebrew/opt/python@3.10/libexec/bin/python -m venv venv arch -arm64 source venv/bin/activate arch -arm64 pip install ./dist/*cp-310*.whl arch -arm64 pip install pytest From 717cc94e1ff73496fccea0673f3f897d12aca0f7 Mon Sep 17 00:00:00 2001 From: Gene Hoffman Date: Sat, 8 Jan 2022 15:03:08 -0800 Subject: [PATCH 05/12] source not found --- .github/workflows/build-m1-wheel.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-m1-wheel.yml b/.github/workflows/build-m1-wheel.yml index 16fa9bc48..a36fed2f6 100644 --- a/.github/workflows/build-m1-wheel.yml +++ b/.github/workflows/build-m1-wheel.yml @@ -40,13 +40,13 @@ jobs: run: | rm -rf venv arch -arm64 /opt/homebrew/opt/python@3.9/libexec/bin/python -m venv venv - arch -arm64 source venv/bin/activate + . venv/bin/activate arch -arm64 /opt/homebrew/opt/python@3.9/libexec/bin/pip wheel -w dist --no-deps . arch -arm64 delocate-wheel -v dist/*cp39*.whl deactivate rm -rf venv arch -arm64 /opt/homebrew/opt/python@3.10/libexec/bin/python -m venv venv - arch -arm64 source venv/bin/activate + . venv/bin/activate arch -arm64 /opt/homebrew/opt/python@3.10/libexec/bin/pip wheel -w dist --no-deps . arch -arm64 delocate-wheel -v dist/*cp310*.whl deactivate @@ -56,14 +56,14 @@ jobs: run: | rm -rf venv arch -arm64 /opt/homebrew/opt/python@3.9/libexec/bin/python -m venv venv - arch -arm64 source venv/bin/activate + . venv/bin/activate arch -arm64 pip install ./dist/*cp-39*.whl arch -arm64 pip install pytest arch -arm64 ./venv/bin/pytest -v ./python-bindings/test.py deactivate rm -rf venv arch -arm64 /opt/homebrew/opt/python@3.10/libexec/bin/python -m venv venv - arch -arm64 source venv/bin/activate + . venv/bin/activate arch -arm64 pip install ./dist/*cp-310*.whl arch -arm64 pip install pytest arch -arm64 ./venv/bin/pytest -v ./python-bindings/test.py From 8f060271a9a4eeb5b7c843303d9f90f48e86a716 Mon Sep 17 00:00:00 2001 From: Gene Hoffman Date: Sat, 8 Jan 2022 15:06:50 -0800 Subject: [PATCH 06/12] no dash in cp39, cp310 --- .github/workflows/build-m1-wheel.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-m1-wheel.yml b/.github/workflows/build-m1-wheel.yml index a36fed2f6..f95a58533 100644 --- a/.github/workflows/build-m1-wheel.yml +++ b/.github/workflows/build-m1-wheel.yml @@ -57,14 +57,14 @@ jobs: rm -rf venv arch -arm64 /opt/homebrew/opt/python@3.9/libexec/bin/python -m venv venv . venv/bin/activate - arch -arm64 pip install ./dist/*cp-39*.whl + arch -arm64 pip install ./dist/*cp39*.whl arch -arm64 pip install pytest arch -arm64 ./venv/bin/pytest -v ./python-bindings/test.py deactivate rm -rf venv arch -arm64 /opt/homebrew/opt/python@3.10/libexec/bin/python -m venv venv . venv/bin/activate - arch -arm64 pip install ./dist/*cp-310*.whl + arch -arm64 pip install ./dist/*cp310*.whl arch -arm64 pip install pytest arch -arm64 ./venv/bin/pytest -v ./python-bindings/test.py deactivate From f95b182bace3a6f610ae28d7ce4358a0f32743fb Mon Sep 17 00:00:00 2001 From: Gene Hoffman Date: Sat, 8 Jan 2022 15:39:24 -0800 Subject: [PATCH 07/12] use brew install instead --- .github/workflows/build-m1-wheel.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-m1-wheel.yml b/.github/workflows/build-m1-wheel.yml index f95a58533..7006f32d1 100644 --- a/.github/workflows/build-m1-wheel.yml +++ b/.github/workflows/build-m1-wheel.yml @@ -31,10 +31,8 @@ jobs: - name: Brew update Python run: | - arch -arm64 brew upgrade python@3.9 - arch -arm64 brew upgrade python@3.10 - arch -arm64 brew info python@3.9 - arch -arm64 brew info python@3.10 + arch -arm64 brew install python@3.9 + arch -arm64 brew install python@3.10 - name: Build m1 wheels for 3.9 and 3.10 run: | From af10e424026f7e0f6c72e9fffc705861211ea1af Mon Sep 17 00:00:00 2001 From: Gene Hoffman Date: Sat, 8 Jan 2022 15:46:55 -0800 Subject: [PATCH 08/12] pip install delocate-wheel --- .github/workflows/build-m1-wheel.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-m1-wheel.yml b/.github/workflows/build-m1-wheel.yml index 7006f32d1..adf843f0a 100644 --- a/.github/workflows/build-m1-wheel.yml +++ b/.github/workflows/build-m1-wheel.yml @@ -40,12 +40,14 @@ jobs: arch -arm64 /opt/homebrew/opt/python@3.9/libexec/bin/python -m venv venv . venv/bin/activate arch -arm64 /opt/homebrew/opt/python@3.9/libexec/bin/pip wheel -w dist --no-deps . + arch -arm64 pip install delocate-wheel arch -arm64 delocate-wheel -v dist/*cp39*.whl deactivate rm -rf venv arch -arm64 /opt/homebrew/opt/python@3.10/libexec/bin/python -m venv venv . venv/bin/activate arch -arm64 /opt/homebrew/opt/python@3.10/libexec/bin/pip wheel -w dist --no-deps . + arch -arm64 pip install delocate-wheel arch -arm64 delocate-wheel -v dist/*cp310*.whl deactivate rm -rf venv From f93147a37224853f383784b8e76b4a4deaabba10 Mon Sep 17 00:00:00 2001 From: Gene Hoffman Date: Sat, 8 Jan 2022 15:49:43 -0800 Subject: [PATCH 09/12] $(brew --prefix python@3.9) --- .github/workflows/build-m1-wheel.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-m1-wheel.yml b/.github/workflows/build-m1-wheel.yml index adf843f0a..b7ce10b0b 100644 --- a/.github/workflows/build-m1-wheel.yml +++ b/.github/workflows/build-m1-wheel.yml @@ -37,16 +37,16 @@ jobs: - name: Build m1 wheels for 3.9 and 3.10 run: | rm -rf venv - arch -arm64 /opt/homebrew/opt/python@3.9/libexec/bin/python -m venv venv + arch -arm64 $(brew --prefix python@3.9)/libexec/bin/python -m venv venv . venv/bin/activate - arch -arm64 /opt/homebrew/opt/python@3.9/libexec/bin/pip wheel -w dist --no-deps . + arch -arm64 $(brew --prefix python@3.9)/libexec/bin/pip wheel -w dist --no-deps . arch -arm64 pip install delocate-wheel arch -arm64 delocate-wheel -v dist/*cp39*.whl deactivate rm -rf venv - arch -arm64 /opt/homebrew/opt/python@3.10/libexec/bin/python -m venv venv + arch -arm64 $(brew --prefix python@3.10)/libexec/bin/python -m venv venv . venv/bin/activate - arch -arm64 /opt/homebrew/opt/python@3.10/libexec/bin/pip wheel -w dist --no-deps . + arch -arm64 $(brew --prefix python@3.10)/libexec/bin/pip wheel -w dist --no-deps . arch -arm64 pip install delocate-wheel arch -arm64 delocate-wheel -v dist/*cp310*.whl deactivate @@ -55,14 +55,14 @@ jobs: - name: Test wheel run: | rm -rf venv - arch -arm64 /opt/homebrew/opt/python@3.9/libexec/bin/python -m venv venv + arch -arm64 $(brew --prefix python@3.9)/libexec/bin/python -m venv venv . venv/bin/activate arch -arm64 pip install ./dist/*cp39*.whl arch -arm64 pip install pytest arch -arm64 ./venv/bin/pytest -v ./python-bindings/test.py deactivate rm -rf venv - arch -arm64 /opt/homebrew/opt/python@3.10/libexec/bin/python -m venv venv + arch -arm64 $(brew --prefix python@3.10)/libexec/bin/python -m venv venv . venv/bin/activate arch -arm64 pip install ./dist/*cp310*.whl arch -arm64 pip install pytest From 9b91f6cd261914e5f84fd86e00f2c64171241fce Mon Sep 17 00:00:00 2001 From: Gene Hoffman Date: Sat, 8 Jan 2022 15:52:24 -0800 Subject: [PATCH 10/12] shorten path --- .github/workflows/build-m1-wheel.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-m1-wheel.yml b/.github/workflows/build-m1-wheel.yml index b7ce10b0b..066241dc8 100644 --- a/.github/workflows/build-m1-wheel.yml +++ b/.github/workflows/build-m1-wheel.yml @@ -37,16 +37,16 @@ jobs: - name: Build m1 wheels for 3.9 and 3.10 run: | rm -rf venv - arch -arm64 $(brew --prefix python@3.9)/libexec/bin/python -m venv venv + arch -arm64 $(brew --prefix python@3.9)/python -m venv venv . venv/bin/activate - arch -arm64 $(brew --prefix python@3.9)/libexec/bin/pip wheel -w dist --no-deps . + arch -arm64 $(brew --prefix python@3.9)/pip wheel -w dist --no-deps . arch -arm64 pip install delocate-wheel arch -arm64 delocate-wheel -v dist/*cp39*.whl deactivate rm -rf venv - arch -arm64 $(brew --prefix python@3.10)/libexec/bin/python -m venv venv + arch -arm64 $(brew --prefix python@3.10)/python -m venv venv . venv/bin/activate - arch -arm64 $(brew --prefix python@3.10)/libexec/bin/pip wheel -w dist --no-deps . + arch -arm64 $(brew --prefix python@3.10)/pip wheel -w dist --no-deps . arch -arm64 pip install delocate-wheel arch -arm64 delocate-wheel -v dist/*cp310*.whl deactivate @@ -55,14 +55,14 @@ jobs: - name: Test wheel run: | rm -rf venv - arch -arm64 $(brew --prefix python@3.9)/libexec/bin/python -m venv venv + arch -arm64 $(brew --prefix python@3.9)/python -m venv venv . venv/bin/activate arch -arm64 pip install ./dist/*cp39*.whl arch -arm64 pip install pytest arch -arm64 ./venv/bin/pytest -v ./python-bindings/test.py deactivate rm -rf venv - arch -arm64 $(brew --prefix python@3.10)/libexec/bin/python -m venv venv + arch -arm64 $(brew --prefix python@3.10)/python -m venv venv . venv/bin/activate arch -arm64 pip install ./dist/*cp310*.whl arch -arm64 pip install pytest From 578ddb785038be595d7b1a95e6521e1a7b32fba2 Mon Sep 17 00:00:00 2001 From: Gene Hoffman Date: Sat, 8 Jan 2022 15:56:14 -0800 Subject: [PATCH 11/12] path is already full --- .github/workflows/build-m1-wheel.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-m1-wheel.yml b/.github/workflows/build-m1-wheel.yml index 066241dc8..19e723e89 100644 --- a/.github/workflows/build-m1-wheel.yml +++ b/.github/workflows/build-m1-wheel.yml @@ -37,16 +37,16 @@ jobs: - name: Build m1 wheels for 3.9 and 3.10 run: | rm -rf venv - arch -arm64 $(brew --prefix python@3.9)/python -m venv venv + arch -arm64 $(brew --prefix python@3.9) -m venv venv . venv/bin/activate - arch -arm64 $(brew --prefix python@3.9)/pip wheel -w dist --no-deps . + arch -arm64 pip wheel -w dist --no-deps . arch -arm64 pip install delocate-wheel arch -arm64 delocate-wheel -v dist/*cp39*.whl deactivate rm -rf venv - arch -arm64 $(brew --prefix python@3.10)/python -m venv venv + arch -arm64 $(brew --prefix python@3.10) -m venv venv . venv/bin/activate - arch -arm64 $(brew --prefix python@3.10)/pip wheel -w dist --no-deps . + arch -arm64 pip wheel -w dist --no-deps . arch -arm64 pip install delocate-wheel arch -arm64 delocate-wheel -v dist/*cp310*.whl deactivate @@ -55,14 +55,14 @@ jobs: - name: Test wheel run: | rm -rf venv - arch -arm64 $(brew --prefix python@3.9)/python -m venv venv + arch -arm64 $(brew --prefix python@3.9) -m venv venv . venv/bin/activate arch -arm64 pip install ./dist/*cp39*.whl arch -arm64 pip install pytest arch -arm64 ./venv/bin/pytest -v ./python-bindings/test.py deactivate rm -rf venv - arch -arm64 $(brew --prefix python@3.10)/python -m venv venv + arch -arm64 $(brew --prefix python@3.10) -m venv venv . venv/bin/activate arch -arm64 pip install ./dist/*cp310*.whl arch -arm64 pip install pytest From 6974e2556b865c1678fd91ce529dc8ba96d228b2 Mon Sep 17 00:00:00 2001 From: Gene Hoffman Date: Sat, 8 Jan 2022 16:04:16 -0800 Subject: [PATCH 12/12] Update path and correct delocate install --- .github/workflows/build-m1-wheel.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-m1-wheel.yml b/.github/workflows/build-m1-wheel.yml index 19e723e89..6700e8d34 100644 --- a/.github/workflows/build-m1-wheel.yml +++ b/.github/workflows/build-m1-wheel.yml @@ -37,17 +37,17 @@ jobs: - name: Build m1 wheels for 3.9 and 3.10 run: | rm -rf venv - arch -arm64 $(brew --prefix python@3.9) -m venv venv + arch -arm64 $(brew --prefix python@3.9)/libexec/bin/python -m venv venv . venv/bin/activate arch -arm64 pip wheel -w dist --no-deps . - arch -arm64 pip install delocate-wheel + arch -arm64 pip install delocate arch -arm64 delocate-wheel -v dist/*cp39*.whl deactivate rm -rf venv - arch -arm64 $(brew --prefix python@3.10) -m venv venv + arch -arm64 $(brew --prefix python@3.10)/libexec/bin/python -m venv venv . venv/bin/activate arch -arm64 pip wheel -w dist --no-deps . - arch -arm64 pip install delocate-wheel + arch -arm64 pip install delocate arch -arm64 delocate-wheel -v dist/*cp310*.whl deactivate rm -rf venv @@ -55,14 +55,14 @@ jobs: - name: Test wheel run: | rm -rf venv - arch -arm64 $(brew --prefix python@3.9) -m venv venv + arch -arm64 $(brew --prefix python@3.9)/libexec/bin/python -m venv venv . venv/bin/activate arch -arm64 pip install ./dist/*cp39*.whl arch -arm64 pip install pytest arch -arm64 ./venv/bin/pytest -v ./python-bindings/test.py deactivate rm -rf venv - arch -arm64 $(brew --prefix python@3.10) -m venv venv + arch -arm64 $(brew --prefix python@3.10)/libexec/bin/python -m venv venv . venv/bin/activate arch -arm64 pip install ./dist/*cp310*.whl arch -arm64 pip install pytest