From ad5d69ec6c97a6ed18cadb2640cb7db7d78914f1 Mon Sep 17 00:00:00 2001 From: nilsnolde Date: Thu, 13 Apr 2023 15:20:49 +0200 Subject: [PATCH] switch to newer version of cibuildwheel for python 3.11 --- .github/workflows/custom_builds.yml | 4 ++-- .github/workflows/publish_tags.yml | 12 +++++++----- .github/workflows/pull_request.yml | 23 ++++++----------------- .github/workflows/push_master.yml | 4 ++-- CHANGELOG.md | 2 +- 5 files changed, 18 insertions(+), 27 deletions(-) diff --git a/.github/workflows/custom_builds.yml b/.github/workflows/custom_builds.yml index 8c0c513..9815e0f 100644 --- a/.github/workflows/custom_builds.yml +++ b/.github/workflows/custom_builds.yml @@ -34,7 +34,7 @@ jobs: - uses: actions/checkout@v3 - name: Configure Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: '3.10' @@ -62,7 +62,7 @@ jobs: # conan config set "storage.path=$env:GITHUB_WORKSPACE/conan_data" # conan install --install-folder conan_build --remote conancenter . - - uses: pypa/cibuildwheel@v2.3.1 + - uses: pypa/cibuildwheel@v2.12.1 env: MACOSX_DEPLOYMENT_TARGET: 10.15 CIBW_BUILD: cp310* cp39* cp38* diff --git a/.github/workflows/publish_tags.yml b/.github/workflows/publish_tags.yml index ae21b12..18420d8 100644 --- a/.github/workflows/publish_tags.yml +++ b/.github/workflows/publish_tags.yml @@ -27,7 +27,7 @@ jobs: fetch-depth: 0 - name: Configure Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: '3.10' @@ -64,12 +64,12 @@ jobs: conan config set "storage.path=${{ github.workspace }}/conan_data" conan install --install-folder ${{ github.workspace }}/conan_build --remote conancenter . - - uses: pypa/cibuildwheel@v2.3.1 + - uses: pypa/cibuildwheel@v2.12.1 env: MACOSX_DEPLOYMENT_TARGET: 10.15 - name: Upload wheels - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: path: wheelhouse/*.whl @@ -80,9 +80,11 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/setup-python@v3 + - uses: actions/setup-python@v4 + with: + python-version: '3.10' - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v3 with: name: artifact path: dist diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 10f1818..9076864 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -17,29 +17,18 @@ on: jobs: build_wheels: name: PR - cp*, ubuntu-latest - runs-on: macos-latest + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - name: Configure Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: '3.10' - - - name: Install Conan (MacOS) + + - name: Lint & Style Check run: | - pip install pip --upgrade - pip install "conan<2.0.0" - conan profile new default --detect - conan config set "storage.path=${{ github.workspace }}/conan_data" - conan install --install-folder ${{ github.workspace }}/conan_build --remote conancenter . + python -m pip install -r dev-requirements.txt + pre-commit run --all-files --show-diff-on-failure - uses: pypa/cibuildwheel@v2.12.1 - env: - MACOSX_DEPLOYMENT_TARGET: 10.15 - CIBW_BUILD: cp37* cp311* - - - name: Upload wheels - uses: actions/upload-artifact@v2 - with: - path: wheelhouse/*.whl diff --git a/.github/workflows/push_master.yml b/.github/workflows/push_master.yml index 2227f3a..eef5f88 100644 --- a/.github/workflows/push_master.yml +++ b/.github/workflows/push_master.yml @@ -32,7 +32,7 @@ jobs: - uses: actions/checkout@v3 - name: Configure Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: '3.10' @@ -71,7 +71,7 @@ jobs: conan install --install-folder conan_build --remote conancenter . # only build the earliest supported python version - - uses: pypa/cibuildwheel@v2.3.1 + - uses: pypa/cibuildwheel@v2.12.1 env: MACOSX_DEPLOYMENT_TARGET: 10.15 CIBW_BUILD: cp37* diff --git a/CHANGELOG.md b/CHANGELOG.md index 5765169..fa25204 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). ## Unreleased -## [3.0.5](https://pypi.org/project/pyvalhalla/3.0.4/) - 2023-04-13 +## [3.0.5](https://pypi.org/project/pyvalhalla/3.0.5/) - 2023-04-13 _Valhalla version 3.3.0_