Skip to content

Commit

Permalink
Add preliminary support for Python 3.12a6.
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Howitz authored and icemac committed Mar 31, 2023
1 parent 42457e0 commit 27e1c94
Show file tree
Hide file tree
Showing 7 changed files with 50 additions and 11 deletions.
34 changes: 30 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,16 +96,17 @@ jobs:
fail-fast: false
matrix:
python-version:
- "pypy-3.7"
- "pypy-3.9"
- "3.7"
- "3.8"
- "3.9"
- "3.10"
- "3.11"
- "3.12.0-alpha.6"
os: [ubuntu-20.04, macos-11]
exclude:
- os: macos-11
python-version: "pypy-3.7"
python-version: "pypy-3.9"

steps:
- name: checkout
Expand Down Expand Up @@ -178,7 +179,15 @@ jobs:
python setup.py build_ext -i
python setup.py bdist_wheel
- name: Install BTrees and dependencies (3.12.0-alpha.6)
if: matrix.python-version == '3.12.0-alpha.6'
run: |
# Install to collect dependencies into the (pip) cache.
# Use "--pre" here because dependencies with support for this future
# Python release may only be available as pre-releases
pip install --pre .[test]
- name: Install BTrees and dependencies
if: matrix.python-version != '3.12.0-alpha.6'
run: |
# Install to collect dependencies into the (pip) cache.
pip install .[test]
Expand Down Expand Up @@ -222,6 +231,7 @@ jobs:
&& startsWith(github.ref, 'refs/tags')
&& startsWith(runner.os, 'Mac')
&& !startsWith(matrix.python-version, 'pypy')
&& !startsWith(matrix.python-version, '3.12.0-alpha.6')
env:
TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
run: |
Expand All @@ -234,16 +244,17 @@ jobs:
fail-fast: false
matrix:
python-version:
- "pypy-3.7"
- "pypy-3.9"
- "3.7"
- "3.8"
- "3.9"
- "3.10"
- "3.11"
- "3.12.0-alpha.6"
os: [ubuntu-20.04, macos-11]
exclude:
- os: macos-11
python-version: "pypy-3.7"
python-version: "pypy-3.9"

steps:
- name: checkout
Expand Down Expand Up @@ -276,7 +287,22 @@ jobs:
with:
name: BTrees-${{ runner.os }}-${{ matrix.python-version }}.whl
path: dist/
- name: Install BTrees 3.12.0-alpha.6
if: ${{ startsWith(matrix.python-version, '3.12.0-alpha.6') }}
run: |
pip install -U wheel setuptools
# coverage has a wheel on PyPI for a future python version which is
# not ABI compatible with the current one, so build it from sdist:
pip install -U --no-binary :all: coverage
# Unzip into src/ so that testrunner can find the .so files
# when we ask it to load tests from that directory. This
# might also save some build time?
unzip -n dist/BTrees-*whl -d src
# Use "--pre" here because dependencies with support for this future
# Python release may only be available as pre-releases
pip install --pre -U -e .[test]
- name: Install BTrees
if: ${{ !startsWith(matrix.python-version, '3.12.0-alpha.6') }}
run: |
pip install -U wheel setuptools
pip install -U coverage
Expand Down
11 changes: 9 additions & 2 deletions .manylinux-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ yum -y install libffi-devel

tox_env_map() {
case $1 in
*"cp312"*) echo 'py312';;
*"cp37"*) echo 'py37';;
*"cp38"*) echo 'py38';;
*"cp39"*) echo 'py39';;
Expand All @@ -52,13 +53,19 @@ tox_env_map() {
# Compile wheels
for PYBIN in /opt/python/*/bin; do
if \
[[ "${PYBIN}" == *"cp312"* ]] || \
[[ "${PYBIN}" == *"cp311"* ]] || \
[[ "${PYBIN}" == *"cp37"* ]] || \
[[ "${PYBIN}" == *"cp38"* ]] || \
[[ "${PYBIN}" == *"cp39"* ]] || \
[[ "${PYBIN}" == *"cp310"* ]] ; then
"${PYBIN}/pip" install -e /io/
"${PYBIN}/pip" wheel /io/ -w wheelhouse/
if [[ "${PYBIN}" == *"cp312"* ]] ; then
"${PYBIN}/pip" install --pre -e /io/
"${PYBIN}/pip" wheel /io/ --pre -w wheelhouse/
else
"${PYBIN}/pip" install -e /io/
"${PYBIN}/pip" wheel /io/ -w wheelhouse/
fi
if [ `uname -m` == 'aarch64' ]; then
# Running the test suite takes forever in
# emulation; an early run (using tox, which is also slow)
Expand Down
4 changes: 2 additions & 2 deletions .meta.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
# https://github.com/zopefoundation/meta/tree/master/config/c-code
[meta]
template = "c-code"
commit-id = "3c9d0741"
commit-id = "66322213"

[python]
with-appveyor = true
with-windows = false
with-pypy = true
with-future-python = false
with-future-python = true
with-docs = true
with-sphinx-doctests = true
with-macos = false
Expand Down
2 changes: 1 addition & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
5.1 (unreleased)
================

- Nothing changed yet.
- Add preliminary support for Python 3.12a6.


5.0 (2023-02-10)
Expand Down
3 changes: 3 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ environment:
- python: 39-x64
- python: 310-x64
- python: 311-x64
# `multibuild` cannot install non-final versions as they are not on
# ftp.python.org, so we skip Python 3.11 until its final release:
# - python: 312-x64

install:
- "SET PYTHONVERSION=%PYTHON%"
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ignore =
force_single_line = True
combine_as_imports = True
sections = FUTURE,STDLIB,THIRDPARTY,ZOPE,FIRSTPARTY,LOCALFOLDER
known_third_party = six, docutils, pkg_resources
known_third_party = docutils, pkg_resources, pytz
known_zope =
known_first_party =
default_section = ZOPE
Expand Down
5 changes: 4 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
# Generated from:
# https://github.com/zopefoundation/meta/tree/master/config/c-code
[tox]
minversion = 3.18
minversion = 4.0
envlist =
lint
py37,py37-pure
py38,py38-pure
py39,py39-pure
py310,py310-pure
py311,py311-pure
py312,py312-pure
pypy3
docs
coverage
Expand All @@ -17,7 +18,9 @@ envlist =

[testenv]
usedevelop = true
pip_pre = py312: true
deps =
Sphinx
setenv =
pure: PURE_PYTHON=1
!pure-!pypy3: PURE_PYTHON=0
Expand Down

0 comments on commit 27e1c94

Please sign in to comment.