Skip to content

Commit

Permalink
Add python 3.12 wheels on v3.7 (#344)
Browse files Browse the repository at this point in the history
* Add python 3.12 wheels on v3.7

* Upgrade cibuildwheel to v2.16.5 to support python 3.12

* drop 2.7

* Drop cibuildwheel v1 and 3.5 tests (#325)

* Drop cibuildwheel v1 and 3.5 tests

* try [email protected]

* drop down to [email protected]

* bump ubuntu from 20.04 to 22.04

* Revert "bump ubuntu from 20.04 to 22.04"

This reverts commit f94bea6.

* bump Python version from 3.8 to 3.11 for coverage/lint and docs

* bump cibuildwheel

* Drop 3.6

* Upgrade back to cibuildwheel 2.16.5

---------

Co-authored-by: AJ Friend <[email protected]>
  • Loading branch information
msaecker and ajfriend authored Mar 9, 2024
1 parent f8958ac commit b04ac8b
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 55 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/coverage-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
tests:
name: Coverage and Lint
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v3
Expand All @@ -18,7 +18,7 @@ jobs:

- uses: actions/[email protected]
with:
python-version: 3.8
python-version: 3.11

- name: Install from source
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

- uses: actions/[email protected]
with:
python-version: 3.8
python-version: 3.11

- name: Install dependencies
run: |
Expand Down
10 changes: 2 additions & 8 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,8 @@ jobs:

strategy:
matrix:
os: [macos-latest, windows-latest, ubuntu-latest]
python-version: ['2.7', '3.5', '3.6', '3.7', '3.8', '3.9', '3.10', '3.11']
exclude:
- os: windows-latest
python-version: 2.7
- os: windows-latest
python-version: 3.5
os: [macos-latest, windows-latest, ubuntu-20.04]
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]

steps:
- uses: actions/checkout@v3
Expand All @@ -40,7 +35,6 @@ jobs:
echo "CC=cl.exe" >> $GITHUB_ENV
echo "CXX=cl.exe" >> $GITHUB_ENV
## End Windows stuff

- name: Install from source
run: |
pip install --upgrade pip setuptools wheel
Expand Down
50 changes: 6 additions & 44 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,44 +46,6 @@ jobs:
with:
path: ./dist

make_cibw_v1_wheels:
name: "cibuildwheel v1: ${{ matrix.name }}"
if: ${{ github.event_name != 'pull_request' || !github.event.pull_request.draft }}
runs-on: ${{ matrix.os }}
strategy:
matrix:
# Only build for platforms that cibw v2 doesn't support
include:
- os: macos-latest
build: "cp27-macosx_x86_64"
name: macOS Intel
- os: ubuntu-latest
build: "cp27-manylinux_x86_64"
name: Linux Intel 64-bit

steps:
- uses: actions/checkout@v3
with:
submodules: recursive

## Build

- uses: pypa/[email protected]
env:
CIBW_TEST_REQUIRES: pytest numpy
CIBW_TEST_COMMAND: pytest {project}/tests
CIBW_ARCHS_LINUX: auto aarch64
CIBW_BUILD: ${{ matrix.build }}

- name: Check with Twine
run: |
pipx run twine check wheelhouse/*
- name: Upload artifacts to GitHub
uses: actions/upload-artifact@v3
with:
path: wheelhouse/*.whl

make_cibw_v2_wheels:
name: "cibuildwheel v2: ${{ matrix.name }}"
if: ${{ github.event_name != 'pull_request' || !github.event.pull_request.draft }}
Expand All @@ -103,9 +65,6 @@ jobs:
- os: ubuntu-latest
build: "cp*-musllinux_x86_64"
name: Linux Intel musl 64-bit
- os: ubuntu-latest
build: "cp36-manylinux_aarch64"
name: Linux Aarch64 3.6
- os: ubuntu-latest
build: "cp37-manylinux_aarch64"
name: Linux Aarch64 3.7
Expand All @@ -121,6 +80,9 @@ jobs:
- os: ubuntu-latest
build: "cp311-manylinux_aarch64"
name: Linux Aarch64 3.11
- os: ubuntu-latest
build: "cp312-manylinux_aarch64"
name: Linux Aarch64 3.12

steps:
- uses: actions/checkout@v3
Expand All @@ -147,7 +109,7 @@ jobs:

## Build

- uses: pypa/cibuildwheel@v2.11.2
- uses: pypa/cibuildwheel@v2.16.5
env:
CIBW_TEST_REQUIRES: pytest numpy
CIBW_TEST_COMMAND: pytest {project}/tests
Expand All @@ -166,8 +128,8 @@ jobs:
path: wheelhouse/*.whl

upload_all:
needs: [make_sdist, make_cibw_v1_wheels, make_cibw_v2_wheels]
runs-on: ubuntu-latest
needs: [make_sdist, make_cibw_v2_wheels]
runs-on: ubuntu-20.04
if: github.event_name == 'release' && github.event.action == 'published'

steps:
Expand Down
1 change: 1 addition & 0 deletions src/h3/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"Programming Language :: Python :: 3.9",
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.12',
"Operating System :: MacOS :: MacOS X",
"Operating System :: POSIX :: Linux",
"Operating System :: Microsoft :: Windows",
Expand Down

0 comments on commit b04ac8b

Please sign in to comment.