From b0a0485d4d8dec032f3f2699f3983a333a57086b Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Mon, 14 Aug 2023 12:41:40 -0400 Subject: [PATCH] ci: update more to 3.12 Signed-off-by: Henry Schreiner --- .github/workflows/deploy-cpp.yml | 6 +++--- .github/workflows/packaging-test.yml | 2 +- .github/workflows/test.yml | 12 +++++++++--- README.md | 2 +- cibuildwheel.toml | 8 ++++---- pyproject.toml | 1 + 6 files changed, 19 insertions(+), 12 deletions(-) diff --git a/.github/workflows/deploy-cpp.yml b/.github/workflows/deploy-cpp.yml index bce06cc4e6..dfe7ec7702 100644 --- a/.github/workflows/deploy-cpp.yml +++ b/.github/workflows/deploy-cpp.yml @@ -83,10 +83,10 @@ jobs: with: submodules: true - - name: Python 3.10 + - name: Python 3.11 uses: actions/setup-python@v4 with: - python-version: '3.10' + python-version: '3.11' - name: Prepare build files run: pipx run nox -s prepare @@ -122,7 +122,7 @@ jobs: SOURCE_DATE_EPOCH: ${{ needs.determine-source-date-epoch.outputs.source-date-epoch }} strategy: matrix: - python: [38, 39, 310, 311] + python: [38, 39, 310, 311, 312] arch: [aarch64] steps: diff --git a/.github/workflows/packaging-test.yml b/.github/workflows/packaging-test.yml index 8d684f2b2c..2108281fe3 100644 --- a/.github/workflows/packaging-test.yml +++ b/.github/workflows/packaging-test.yml @@ -67,7 +67,7 @@ jobs: - uses: pypa/cibuildwheel@v2.15.0 if: matrix.os == 'ubuntu-latest' env: - CIBW_BUILD: cp311-manylinux_x86_64 + CIBW_BUILD: cp312-manylinux_x86_64 with: config-file: cibuildwheel.toml package-dir: awkward-cpp diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b753ff1773..df86ca93c9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -33,6 +33,7 @@ jobs: strategy: matrix: python-version: + - '3.12' - '3.11' - '3.10' - '3.9' @@ -48,7 +49,8 @@ jobs: runs-on: windows-2019 env: - PIP_ONLY_BINARY: cmake + PIP_ONLY_BINARY: cmake,numpy + PIP_PRE: "1" steps: - uses: actions/checkout@v3 @@ -111,6 +113,7 @@ jobs: strategy: matrix: python-version: + - '3.12' - '3.11' - '3.10' - '3.9' @@ -119,7 +122,8 @@ jobs: runs-on: macOS-11 env: - PIP_ONLY_BINARY: cmake + PIP_ONLY_BINARY: cmake,numpy + PIP_PRE: "1" steps: - uses: actions/checkout@v3 @@ -190,8 +194,10 @@ jobs: include: - python-version: '3.8' numpy-package: "numpy==1.18.0" + - python-version: '3.12' + numpy-package: "numpy>=1.26.0b1" - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 env: PIP_ONLY_BINARY: cmake diff --git a/README.md b/README.md index 78e1f8c937..04440936aa 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![PyPI version](https://badge.fury.io/py/awkward.svg)](https://pypi.org/project/awkward) [![Conda-Forge](https://img.shields.io/conda/vn/conda-forge/awkward)](https://github.com/conda-forge/awkward-feedstock) -[![Python 3.7‒3.11](https://img.shields.io/badge/python-3.7%E2%80%923.11-blue)](https://www.python.org) +[![Python 3.8‒3.12](https://img.shields.io/badge/python-3.8%E2%80%923.12-blue)](https://www.python.org) [![BSD-3 Clause License](https://img.shields.io/badge/license-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause) [![Build Test](https://github.com/scikit-hep/awkward/actions/workflows/test.yml/badge.svg?branch=main)](https://github.com/scikit-hep/awkward/actions/workflows/test.yml) diff --git a/cibuildwheel.toml b/cibuildwheel.toml index 7293ece602..bfca433578 100644 --- a/cibuildwheel.toml +++ b/cibuildwheel.toml @@ -15,11 +15,11 @@ test-skip = [ "pp*", "*musllinux*", ] -manylinux-x86_64-image = "manylinux2014" build-verbosity = 1 -overrides = [ - { select = "cp3?-*", manylinux-x86_64-image = "manylinux2014" }, -] [tool.cibuildwheel.environment] PIP_ONLY_BINARY = "cmake,numpy" + +[[tool.cibuildwheel.overrides]] +select = "cp312-*" +environment.PIP_PRE = "1" diff --git a/pyproject.toml b/pyproject.toml index afc6d488a8..feb0b0b368 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,6 +31,7 @@ classifiers = [ "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "Topic :: Scientific/Engineering", "Topic :: Scientific/Engineering :: Information Analysis", "Topic :: Scientific/Engineering :: Mathematics",