Skip to content

Commit

Permalink
Merge pull request #62 from zopefoundation/config-with-c-code-templat…
Browse files Browse the repository at this point in the history
…e-a361e1fd

Finalize Python 3.12 support
  • Loading branch information
dataflake authored Oct 5, 2023
2 parents fd393a3 + 1be8ced commit 06caac7
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 46 deletions.
28 changes: 2 additions & 26 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ jobs:
- "3.9"
- "3.10"
- "3.11"
- "3.12.0-rc.3"
- "3.12"
os: [ubuntu-20.04, macos-11]
exclude:
- os: macos-11
Expand Down Expand Up @@ -178,15 +178,7 @@ jobs:
python setup.py build_ext -i
python setup.py bdist_wheel
- name: Install zope.proxy and dependencies (3.12.0-rc.3)
if: matrix.python-version == '3.12.0-rc.3'
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 zope.proxy and dependencies
if: matrix.python-version != '3.12.0-rc.3'
run: |
# Install to collect dependencies into the (pip) cache.
pip install .[test]
Expand Down Expand Up @@ -230,7 +222,6 @@ jobs:
&& startsWith(github.ref, 'refs/tags')
&& startsWith(runner.os, 'Mac')
&& !startsWith(matrix.python-version, 'pypy')
&& !startsWith(matrix.python-version, '3.12.0-rc.3')
env:
TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
run: |
Expand All @@ -249,7 +240,7 @@ jobs:
- "3.9"
- "3.10"
- "3.11"
- "3.12.0-rc.3"
- "3.12"
os: [ubuntu-20.04, macos-11]
exclude:
- os: macos-11
Expand Down Expand Up @@ -286,22 +277,7 @@ jobs:
with:
name: zope.proxy-${{ runner.os }}-${{ matrix.python-version }}.whl
path: dist/
- name: Install zope.proxy 3.12.0-rc.3
if: ${{ startsWith(matrix.python-version, '3.12.0-rc.3') }}
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/zope.proxy-*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 zope.proxy
if: ${{ !startsWith(matrix.python-version, '3.12.0-rc.3') }}
run: |
pip install -U wheel setuptools
pip install -U coverage
Expand Down
13 changes: 4 additions & 9 deletions .manylinux-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,32 +28,27 @@ yum -y install libffi-devel

tox_env_map() {
case $1 in
*"cp312"*) echo 'py312';;
*"cp37"*) echo 'py37';;
*"cp38"*) echo 'py38';;
*"cp39"*) echo 'py39';;
*"cp310"*) echo 'py310';;
*"cp311"*) echo 'py311';;
*"cp312"*) echo 'py312';;
*) echo 'py';;
esac
}

# Compile wheels
for PYBIN in /opt/python/*/bin; do
if \
[[ "${PYBIN}" == *"cp312"* ]] || \
[[ "${PYBIN}" == *"cp311"* ]] || \
[[ "${PYBIN}" == *"cp312"* ]] || \
[[ "${PYBIN}" == *"cp37"* ]] || \
[[ "${PYBIN}" == *"cp38"* ]] || \
[[ "${PYBIN}" == *"cp39"* ]] || \
[[ "${PYBIN}" == *"cp310"* ]] ; then
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
"${PYBIN}/pip" install -e /io/
"${PYBIN}/pip" wheel /io/ -w wheelhouse/
if [ `uname -m` == 'aarch64' ]; then
cd /io/
${PYBIN}/pip install tox
Expand Down
2 changes: 1 addition & 1 deletion .meta.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# https://github.com/zopefoundation/meta/tree/master/config/c-code
[meta]
template = "c-code"
commit-id = "8f22a5de"
commit-id = "a361e1fd"

[python]
with-appveyor = true
Expand Down
6 changes: 3 additions & 3 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
Changes
=========

5.1 (unreleased)
----------------
5.1 (2023-10-05)
================

- Add preliminary support for Python 3.12rc3.
- Add support for Python 3.12.


5.0.0 (2023-01-18)
Expand Down
4 changes: 1 addition & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ 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
- python: 312-x64

install:
- "SET PYTHONVERSION=%PYTHON%"
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@

# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
html_theme = 'default'
html_theme = 'sphinx_rtd_theme'

# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the
Expand Down
2 changes: 2 additions & 0 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
Sphinx
repoze.sphinx.autointerface
sphinx_rtd_theme>1
docutils<0.19
4 changes: 3 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def read(*rnames):
headers = [os.path.join('src', 'zope', 'proxy', 'proxy.h')]

setup(name='zope.proxy',
version='5.1.dev0',
version='5.1',
author='Zope Foundation and Contributors',
author_email='[email protected]',
description='Generic Transparent Proxies',
Expand All @@ -106,6 +106,7 @@ def read(*rnames):
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.12',
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
'Framework :: Zope :: 3',
Expand Down Expand Up @@ -136,6 +137,7 @@ def read(*rnames):
'docs': [
'Sphinx',
'repoze.sphinx.autointerface',
'sphinx_rtd_theme',
],
},
)
2 changes: 0 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@ envlist =

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

0 comments on commit 06caac7

Please sign in to comment.