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 b178b71cf..6700e8d34 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 }} @@ -29,29 +29,46 @@ 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 install python@3.9 + arch -arm64 brew install python@3.10 - - name: Lint source with mypy - run: | - arch -arm64 pip install mypy - arch -arm64 mypy --config-file mypi.ini python-bindings python-impl - - - name: Build m1 wheels + - 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 + . venv/bin/activate + arch -arm64 pip wheel -w dist --no-deps . + arch -arm64 pip install delocate + 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 + . venv/bin/activate arch -arm64 pip wheel -w dist --no-deps . - arch -arm64 delocate-wheel -v dist/*.whl + arch -arm64 pip install delocate + 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 $(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)/libexec/bin/python -m venv venv + . venv/bin/activate + arch -arm64 pip install ./dist/*cp310*.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: | 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())