Skip to content

Commit

Permalink
Build 3.13 wheels (#425)
Browse files Browse the repository at this point in the history
* Build 3.13 wheels

* bump to pypa/[email protected]

* a few more 3.13s

* uses: actions/[email protected]

* actions/[email protected]

* docker/[email protected]

* actions/[email protected]

* actions/[email protected]

* pypa/[email protected]

* Steal from #416

* note PR
  • Loading branch information
ajfriend authored Oct 27, 2024
1 parent 4ccb2a2 commit d061d81
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 26 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v4.1.1
- uses: actions/checkout@v4.2.2
with:
submodules: recursive

- uses: actions/setup-python@v5.0.0
- uses: actions/setup-python@v5.3.0
with:
python-version: 3.11

Expand All @@ -28,7 +28,7 @@ jobs:
run: jupyter-book build docs/ --warningiserror --keep-going --all

- name: Upload artifacts
uses: actions/upload-artifact@v4.3.1
uses: actions/upload-artifact@v4.4.3
with:
name: html
path: docs/_build/html
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/coverage-lint-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v4.1.1
- uses: actions/checkout@v4.2.2
with:
submodules: recursive

- uses: actions/setup-python@v5.0.0
- uses: actions/setup-python@v5.3.0
with:
python-version: 3.11

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/coverage-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v4.1.1
- uses: actions/checkout@v4.2.2
with:
submodules: recursive

- uses: actions/setup-python@v5.0.0
- uses: actions/setup-python@v5.3.0
with:
python-version: 3.11

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ jobs:
strategy:
matrix:
os: [macos-latest, windows-latest, ubuntu-22.04]
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']

steps:
- uses: actions/checkout@v4.1.1
- uses: actions/checkout@v4.2.2
with:
submodules: recursive

- uses: actions/setup-python@v5.0.0
- uses: actions/setup-python@v5.3.0
with:
python-version: '${{ matrix.python-version }}'

Expand Down
26 changes: 16 additions & 10 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v4.1.1
- uses: actions/checkout@v4.2.2
with:
submodules: recursive

- name: Setup Python
uses: actions/setup-python@v5.0.0
uses: actions/setup-python@v5.3.0
with:
python-version: 3.11

Expand All @@ -48,7 +48,7 @@ jobs:
run: pytest

- name: Upload artifacts to GitHub
uses: actions/upload-artifact@v4.3.1
uses: actions/upload-artifact@v4.4.3
with:
name: temp_result_sdist
path: ./dist
Expand Down Expand Up @@ -90,6 +90,9 @@ jobs:
- os: ubuntu-22.04
build: 'cp312-musllinux_x86_64'
name: Linux Intel musl 64-bit 3.12
- os: ubuntu-22.04
build: 'cp313-musllinux_x86_64'
name: Linux Intel musl 64-bit 3.13

- os: ubuntu-22.04
build: 'cp38-manylinux_aarch64'
Expand All @@ -106,9 +109,12 @@ jobs:
- os: ubuntu-22.04
build: 'cp312-manylinux_aarch64'
name: Linux Aarch64 3.12
- os: ubuntu-22.04
build: 'cp313-manylinux_aarch64'
name: Linux Aarch64 3.13

steps:
- uses: actions/checkout@v4.1.1
- uses: actions/checkout@v4.2.2
with:
submodules: recursive

Expand All @@ -124,11 +130,11 @@ jobs:
- name: Set up QEMU
if: runner.os == 'Linux'
uses: docker/setup-qemu-action@v3.0.0
uses: docker/setup-qemu-action@v3.2.0
with:
platforms: aarch64

- uses: pypa/cibuildwheel@v2.17.0
- uses: pypa/cibuildwheel@v2.21.3
env:
CIBW_TEST_REQUIRES: pytest pytest-cov numpy
CIBW_TEST_COMMAND: pytest {project}/tests
Expand All @@ -140,7 +146,7 @@ jobs:
pipx run twine check wheelhouse/*
- name: Upload artifacts to GitHub
uses: actions/upload-artifact@v4.3.1
uses: actions/upload-artifact@v4.4.3
with:
name: temp_result_${{ matrix.os }}-${{ strategy.job-index }}
path: wheelhouse/*.whl
Expand All @@ -150,7 +156,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Merge Artifacts
uses: actions/upload-artifact/merge@v4
uses: actions/upload-artifact/merge@v4.4.3
with:
name: wheels_and_sdist
pattern: temp_result_*
Expand All @@ -164,11 +170,11 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/[email protected].7
- uses: actions/[email protected].8
with:
name: wheels_and_sdist
path: dist

- uses: pypa/gh-action-pypi-publish@v1.8.14
- uses: pypa/gh-action-pypi-publish@v1.10.3
with:
password: ${{ secrets.pypi_password }}
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ avoid adding features or APIs which do not map onto the

None.

## [4.1.2] - 2024-10-26

- Build Python 3.13 wheels (#425)

## [4.1.1] - 2024-10-13

- Make sure docs and PyPI page are up-to-date.
Expand Down
9 changes: 3 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = 'scikit_build_core.build'

[project]
name = 'h3'
version = '4.1.1'
version = '4.1.2'
description = "Uber's hierarchical hexagonal geospatial indexing system"
readme = 'readme.md'
license = {file = 'LICENSE'}
Expand All @@ -30,6 +30,7 @@ classifiers = [
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.12',
'Programming Language :: Python :: 3.13',
'Operating System :: MacOS :: MacOS X',
'Operating System :: POSIX :: Linux',
'Operating System :: Microsoft :: Windows',
Expand All @@ -48,8 +49,8 @@ Changelog = 'https://package.readthedocs.io/en/latest/changelog.html'
numpy = ['numpy']
test = ['pytest', 'pytest-cov', 'flake8', 'pylint', 'numpy']
all = [
'h3[test]',
'jupyter-book',
'flake8',
'sphinx>=7.3.3', # https://github.com/sphinx-doc/sphinx/issues/12290
'jupyterlab',
'jupyterlab-geojson',
Expand All @@ -59,10 +60,6 @@ all = [
'contextily',
'cartopy',
'geoviews',
'numpy',
'pytest',
'pytest-cov',
'pylint',
]

[tool.pytest.ini_options]
Expand Down

0 comments on commit d061d81

Please sign in to comment.