Skip to content
This repository has been archived by the owner on Oct 15, 2024. It is now read-only.

Commit

Permalink
build 3.12 (#36)
Browse files Browse the repository at this point in the history
  • Loading branch information
nilsnolde authored May 2, 2024
1 parent 991a53a commit e12c49b
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 26 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/custom_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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: |
Expand All @@ -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
20 changes: 10 additions & 10 deletions .github/workflows/publish_tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down Expand Up @@ -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

Expand All @@ -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/[email protected].5
- uses: pypa/[email protected].14
with:
user: nilsnolde
password: ${{ secrets.PYPI_PASS }}
8 changes: 4 additions & 4 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -19,14 +19,14 @@ jobs:
name: PR - cp*, ubuntu-latest
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Lint & Style Check
run: |
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: 'cp38* cp312*'
MACOSX_DEPLOYMENT_TARGET: 10.15
13 changes: 6 additions & 7 deletions .github/workflows/push_master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -29,18 +29,18 @@ 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'

# keep in-sync with the other yaml
# 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: |
Expand Down Expand Up @@ -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*
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)_
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
author="Nils Nolde",
author_email="[email protected]",
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,
Expand Down

0 comments on commit e12c49b

Please sign in to comment.