bump "latest" CI jobs to 3.12

This commit is contained in:
David Hewitt 2023-10-02 21:12:33 +01:00 committed by David Hewitt
parent 427b2e9386
commit 8392ed2a94
8 changed files with 17 additions and 12 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",

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

@ -2,9 +2,10 @@ CURDIR=$(abspath .)
# These three are passed in from nox. # These three are passed in from nox.
BUILDROOT ?= $(CURDIR)/builddir BUILDROOT ?= $(CURDIR)/builddir
PYMAJORMINORMICRO ?= 3.11.0 PYMAJORMINORMICRO ?= 3.12.0
PYTHON ?= python3.12
EMSCRIPTEN_VERSION=3.1.13 EMSCRIPTEN_VERSION=3.1.46
export EMSDKDIR = $(BUILDROOT)/emsdk export EMSDKDIR = $(BUILDROOT)/emsdk
@ -34,7 +35,7 @@ PYTHONLIBDIR=$(BUILDROOT)/install/Python-$(PYVERSION)/lib
all: $(PYTHONLIBDIR)/libpython$(PYMAJORMINOR).a all: $(PYTHONLIBDIR)/libpython$(PYMAJORMINOR).a
$(BUILDROOT)/.exists: $(BUILDROOT)/.exists:
mkdir -p $(BUILDROOT) mkdir -p $(BUILDROOT)
touch $@ touch $@
@ -66,18 +67,18 @@ $(PYTHONBUILD)/Makefile: $(PYTHONBUILD)/.patched $(BUILDROOT)/emsdk
--build=$(shell $(PYTHONBUILD)/config.guess) \ --build=$(shell $(PYTHONBUILD)/config.guess) \
--with-emscripten-target=browser \ --with-emscripten-target=browser \
--enable-wasm-dynamic-linking \ --enable-wasm-dynamic-linking \
--with-build-python=python3.11 --with-build-python=$(PYTHON)
$(PYTHONLIBDIR)/libpython$(PYMAJORMINOR).a : $(PYTHONBUILD)/Makefile $(PYTHONLIBDIR)/libpython$(PYMAJORMINOR).a : $(PYTHONBUILD)/Makefile
cd $(PYTHONBUILD) && \ cd $(PYTHONBUILD) && \
emmake make -j3 libpython$(PYMAJORMINOR).a emmake make -j3 libpython$(PYMAJORMINOR).a
# Generate sysconfigdata # Generate sysconfigdata
_PYTHON_SYSCONFIGDATA_NAME=$(SYSCONFIGDATA_NAME) _PYTHON_PROJECT_BASE=$(PYTHONBUILD) python3.11 -m sysconfig --generate-posix-vars _PYTHON_SYSCONFIGDATA_NAME=$(SYSCONFIGDATA_NAME) _PYTHON_PROJECT_BASE=$(PYTHONBUILD) $(PYTHON) -m sysconfig --generate-posix-vars
cp `cat pybuilddir.txt`/$(SYSCONFIGDATA_NAME).py $(PYTHONBUILD)/Lib cp `cat pybuilddir.txt`/$(SYSCONFIGDATA_NAME).py $(PYTHONBUILD)/Lib
mkdir -p $(PYTHONLIBDIR) mkdir -p $(PYTHONLIBDIR)
# Copy libexpat.a, libmpdec.a, and libpython3.11.a # Copy libexpat.a, libmpdec.a, and libpython3.12.a
# In noxfile, we explicitly link libexpat and libmpdec via RUSTFLAGS # In noxfile, we explicitly link libexpat and libmpdec via RUSTFLAGS
find $(PYTHONBUILD) -name '*.a' -exec cp {} $(PYTHONLIBDIR) \; find $(PYTHONBUILD) -name '*.a' -exec cp {} $(PYTHONLIBDIR) \;
# Install Python stdlib # Install Python stdlib

View File

@ -1 +0,0 @@
build/lib.linux-x86_64-3.11

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}",
@ -288,6 +289,7 @@ def test_emscripten(session: nox.Session):
f"-C link-arg=-lpython{info.pymajorminor}", f"-C link-arg=-lpython{info.pymajorminor}",
"-C link-arg=-lexpat", "-C link-arg=-lexpat",
"-C link-arg=-lmpdec", "-C link-arg=-lmpdec",
"-C link-arg=-lHacl_Hash_SHA2",
"-C link-arg=-lz", "-C link-arg=-lz",
"-C link-arg=-lbz2", "-C link-arg=-lbz2",
"-C link-arg=-sALLOW_MEMORY_GROWTH=1", "-C link-arg=-sALLOW_MEMORY_GROWTH=1",

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",
] ]