Merge pull request #3489 from davidhewitt/bump-ci-version

bump "latest" CI jobs to 3.12
This commit is contained in:
David Hewitt 2023-10-13 12:20:55 +00:00 committed by GitHub
commit bed3ebeb37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 13 additions and 6 deletions

View File

@ -144,7 +144,7 @@ jobs:
matrix: matrix:
extra-features: ["multiple-pymethods"] extra-features: ["multiple-pymethods"]
rust: [stable] rust: [stable]
python-version: ["3.11"] python-version: ["3.12"]
platform: platform:
[ [
{ {
@ -221,7 +221,7 @@ jobs:
include: include:
# Test minimal supported Rust version # Test minimal supported Rust version
- rust: 1.56.0 - rust: 1.56.0
python-version: "3.11" python-version: "3.12"
platform: platform:
{ {
os: "ubuntu-latest", os: "ubuntu-latest",
@ -233,7 +233,7 @@ jobs:
# Test the `nightly` feature # Test the `nightly` feature
- rust: nightly - rust: nightly
python-version: "3.11" python-version: "3.12"
platform: platform:
{ {
os: "ubuntu-latest", os: "ubuntu-latest",
@ -244,7 +244,7 @@ jobs:
# Test 32-bit Windows only with the latest Python version # Test 32-bit Windows only with the latest Python version
- rust: stable - rust: stable
python-version: "3.11" python-version: "3.12"
platform: platform:
{ {
os: "windows-latest", os: "windows-latest",
@ -334,11 +334,14 @@ jobs:
emscripten: emscripten:
name: emscripten name: emscripten
if: ${{ github.event_name != 'pull_request' && github.ref != 'refs/heads/main' }} if: ${{ contains(github.event.pull_request.labels.*.name, 'CI-build-full') || (github.event_name != 'pull_request' && github.ref != 'refs/heads/main') }}
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: actions/setup-python@v4 - uses: actions/setup-python@v4
with:
# TODO bump emscripten builds to test on 3.12
python-version: 3.11
id: setup-python id: setup-python
- name: Install Rust toolchain - name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable uses: dtolnay/rust-toolchain@stable

1
.gitignore vendored
View File

@ -23,3 +23,4 @@ valgrind-python.supp
*.pyd *.pyd
lcov.info lcov.info
netlify_build/ netlify_build/
.nox/

View File

@ -1 +1 @@
3.11 3.12

1
emscripten/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
pybuilddir.txt

View File

@ -261,6 +261,7 @@ def build_emscripten(session: nox.Session):
"make", "make",
"-C", "-C",
str(info.emscripten_dir), str(info.emscripten_dir),
f"PYTHON={sys.executable}",
f"BUILDROOT={info.builddir}", f"BUILDROOT={info.builddir}",
f"PYMAJORMINORMICRO={info.pymajorminormicro}", f"PYMAJORMINORMICRO={info.pymajorminormicro}",
f"PYPRERELEASE={info.pydev}", f"PYPRERELEASE={info.pydev}",

View File

@ -21,6 +21,7 @@ classifiers = [
"Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python :: Implementation :: PyPy", "Programming Language :: Python :: Implementation :: PyPy",
] ]