From b04788791a337b0f52bdb89014b50357cade854e Mon Sep 17 00:00:00 2001 From: nilsnolde Date: Thu, 2 May 2024 17:08:36 +0200 Subject: [PATCH 1/3] try 3.12 --- .github/workflows/pull_request.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 07acdf4..d28d360 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -26,7 +26,7 @@ jobs: python -m pip install -r dev-requirements.txt pre-commit run --all-files --show-diff-on-failure - - uses: pypa/cibuildwheel@v2.12.1 + - uses: pypa/cibuildwheel@v2.17.0 env: - CIBW_BUILD: cp37* + CIBW_BUILD: cp312* MACOSX_DEPLOYMENT_TARGET: 10.15 From 3b99241e7d1f7613d61e39f7485dbf9ec7f4261c Mon Sep 17 00:00:00 2001 From: nilsnolde Date: Thu, 2 May 2024 17:42:37 +0200 Subject: [PATCH 2/3] update the other workflows as well --- .github/workflows/custom_builds.yml | 8 ++++---- .github/workflows/publish_tags.yml | 20 ++++++++++---------- .github/workflows/pull_request.yml | 6 +++--- .github/workflows/push_master.yml | 13 ++++++------- CHANGELOG.md | 4 ++++ setup.py | 2 +- 6 files changed, 28 insertions(+), 25 deletions(-) diff --git a/.github/workflows/custom_builds.yml b/.github/workflows/custom_builds.yml index 9815e0f..a0d8b5f 100644 --- a/.github/workflows/custom_builds.yml +++ b/.github/workflows/custom_builds.yml @@ -31,7 +31,7 @@ jobs: # cxx: 'Visual Studio' # - macos-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Configure Python uses: actions/setup-python@v4 @@ -41,7 +41,7 @@ jobs: # keep in-sync with the other yaml - name: Cache Conan id: cache-conan - uses: actions/cache@v2 + uses: actions/cache@v4 if: steps.cache-conan.outputs.cache-hit != 'true' with: path: | @@ -62,12 +62,12 @@ jobs: # conan config set "storage.path=$env:GITHUB_WORKSPACE/conan_data" # conan install --install-folder conan_build --remote conancenter . - - uses: pypa/cibuildwheel@v2.12.1 + - uses: pypa/cibuildwheel@v2.17.0 env: MACOSX_DEPLOYMENT_TARGET: 10.15 CIBW_BUILD: cp310* cp39* cp38* - name: Upload wheels - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: path: wheelhouse/*.whl diff --git a/.github/workflows/publish_tags.yml b/.github/workflows/publish_tags.yml index 03daae5..2800822 100644 --- a/.github/workflows/publish_tags.yml +++ b/.github/workflows/publish_tags.yml @@ -22,19 +22,19 @@ jobs: - image: macos-latest platform: macos steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - name: Configure Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version: '3.12' # keep in-sync with the other yaml - name: Cache Conan (MacOS) id: cache-conan - uses: actions/cache@v3 + uses: actions/cache@v4 if: matrix.platform != 'windows' with: path: | @@ -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.12.1 + - uses: pypa/cibuildwheel@v2.17.0 env: MACOSX_DEPLOYMENT_TARGET: 10.15 - name: Upload wheels - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: wheelhouse/*.whl @@ -80,16 +80,16 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version: '3.12' - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: artifact path: dist - - uses: pypa/gh-action-pypi-publish@v1.8.5 + - uses: pypa/gh-action-pypi-publish@v1.8.14 with: user: nilsnolde password: ${{ secrets.PYPI_PASS }} diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index d28d360..533c64e 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -2,7 +2,7 @@ name: Pull Request # run test within the manylinux container: linux is quickest to run but needs access to the right system libs # runs tests on all python versions -# push_master.yml tests all platforms but only py3.7 (lowest supported version) +# push_master.yml tests all platforms but only py3.8 (lowest supported version) on: pull_request: @@ -19,7 +19,7 @@ jobs: name: PR - cp*, ubuntu-latest runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Lint & Style Check run: | @@ -28,5 +28,5 @@ jobs: - uses: pypa/cibuildwheel@v2.17.0 env: - CIBW_BUILD: cp312* + CIBW_BUILD: cpcp38* cpcp312* MACOSX_DEPLOYMENT_TARGET: 10.15 diff --git a/.github/workflows/push_master.yml b/.github/workflows/push_master.yml index eef5f88..b9240d7 100644 --- a/.github/workflows/push_master.yml +++ b/.github/workflows/push_master.yml @@ -15,7 +15,7 @@ on: jobs: build_wheels: - name: Push - cp37*, ${{ matrix.platform }} + name: Push - cp38*, ${{ matrix.platform }} runs-on: ${{ matrix.image }} strategy: fail-fast: true @@ -29,10 +29,10 @@ jobs: platform: macos steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Configure Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.10' @@ -40,7 +40,7 @@ jobs: # only macos makes sense, windows didn't work, linux installs conan inside the docker image - name: Cache Conan (MacOS) id: cache-conan - uses: actions/cache@v2 + uses: actions/cache@v4 if: matrix.platform == 'macos' with: path: | @@ -71,8 +71,7 @@ jobs: conan install --install-folder conan_build --remote conancenter . # only build the earliest supported python version - - uses: pypa/cibuildwheel@v2.12.1 + - uses: pypa/cibuildwheel@v2.17.0 env: MACOSX_DEPLOYMENT_TARGET: 10.15 - CIBW_BUILD: cp37* - CIBW_TEST_COMMAND: '' + CIBW_BUILD: cp38* diff --git a/CHANGELOG.md b/CHANGELOG.md index b75cff2..ba55708 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). _Valhalla version [3.4.0](https://github.com/valhalla/valhalla/releases/tag/3.4.0)_ +### CHANGED + +- Building wheels for 3.12 and deprecate 3.7 [#36](https://github.com/gis-ops/pyvalhalla/pull/36) + ## [3.2.0](https://pypi.org/project/pyvalhalla/3.2.0/) - 2023-05-16 _Valhalla version [3.4.0](https://github.com/valhalla/valhalla/releases/tag/3.4.0)_ diff --git a/setup.py b/setup.py index 5c9d155..7a97c4f 100644 --- a/setup.py +++ b/setup.py @@ -72,7 +72,7 @@ author="Nils Nolde", author_email="nils@gis-ops.com", packages=find_packages(exclude=["tests", "*.tests", "*.tests.*", "tests.*"]), - python_requires=">=3.7.0", + python_requires=">=3.8.0", url="https://github.com/gis-ops/pyvalhalla", ext_package="valhalla", ext_modules=ext_modules, From d9f372ba16df11463e549ad216d33d066b426803 Mon Sep 17 00:00:00 2001 From: nilsnolde Date: Thu, 2 May 2024 17:47:38 +0200 Subject: [PATCH 3/3] wrong syntax --- .github/workflows/pull_request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 533c64e..e1657f4 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -28,5 +28,5 @@ jobs: - uses: pypa/cibuildwheel@v2.17.0 env: - CIBW_BUILD: cpcp38* cpcp312* + CIBW_BUILD: 'cp38* cp312*' MACOSX_DEPLOYMENT_TARGET: 10.15