Skip to content

Commit

Permalink
- prepare release 5.6
Browse files Browse the repository at this point in the history
  • Loading branch information
dataflake committed Nov 3, 2022
1 parent 42fa239 commit 61da8b4
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 40 deletions.
25 changes: 0 additions & 25 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -140,16 +140,6 @@ jobs:
pip install -U pip
pip install -U setuptools wheel twine cffi
- name: Build AccessControl (3.11)
if: ${{ startsWith(matrix.python-version, '3.11') }}
run: |
# Next, build the wheel *in place*. This helps ccache, and also lets us cache the configure
# output (pip install uses a random temporary directory, making this difficult).
python setup.py build_ext -i
python setup.py bdist_wheel
# Also install it, so that we get dependencies in the (pip) cache.
pip install -U 'faulthandler; python_version == "2.7" and platform_python_implementation == "CPython"'
pip install --pre .[test]
- name: Build AccessControl (Python 3.10 on MacOS)
if: >
startsWith(runner.os, 'Mac')
Expand Down Expand Up @@ -196,7 +186,6 @@ jobs:
&& startsWith(github.ref, 'refs/tags')
&& startsWith(runner.os, 'Mac')
&& !startsWith(matrix.python-version, 'pypy')
&& !startsWith(matrix.python-version, '3.11')
env:
TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
run: |
Expand Down Expand Up @@ -253,21 +242,7 @@ jobs:
with:
name: AccessControl-${{ runner.os }}-${{ matrix.python-version }}.whl
path: dist/
- name: Install AccessControl 3.11
if: ${{ startsWith(matrix.python-version, '3.11') }}
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
pip install -U 'faulthandler; python_version == "2.7" and platform_python_implementation == "CPython"'
# 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/AccessControl-*whl -d src
pip install --pre -U -e .[test]
- name: Install AccessControl
if: ${{ !startsWith(matrix.python-version, '3.11') }}
run: |
pip install -U wheel setuptools
pip install -U coverage
Expand Down
11 changes: 3 additions & 8 deletions .manylinux-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ tox_env_map() {
case $1 in
*"cp27"*) echo 'py27';;
*"cp35"*) echo 'py35';;
*"cp311"*) echo 'py311';;
*"cp36"*) echo 'py36';;
*"cp37"*) echo 'py37';;
*"cp38"*) echo 'py38';;
*"cp39"*) echo 'py39';;
*"cp310"*) echo 'py310';;
*"cp311"*) echo 'py311';;
*) echo 'py';;
esac
}
Expand All @@ -51,13 +51,8 @@ for PYBIN in /opt/python/*/bin; do
[[ "${PYBIN}" == *"cp38"* ]] || \
[[ "${PYBIN}" == *"cp39"* ]] || \
[[ "${PYBIN}" == *"cp310"* ]] ; then
if [[ "${PYBIN}" == *"cp311"* ]] ; 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
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 = "70229255d495a945324228b50ee735cc75e01430"
commit-id = "b4dd6f9ffd3d6a2cde7dc70512c62d4c7ed22cd6"

[python]
with-appveyor = true
with-windows = false
with-pypy = false
with-future-python = true
with-future-python = false
with-legacy-python = true
with-sphinx-doctests = false

Expand Down
2 changes: 1 addition & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Changelog

For changes before version 3.0, see ``HISTORY.rst``.

5.6 (unreleased)
5.6 (2022-11-03)
----------------

- Add support for final Python 3.11 release.
Expand Down
2 changes: 0 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ environment:
- python: 39-x64
- python: 310
- python: 310-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: 311
- python: 311-x64

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
join('include', 'Acquisition', 'Acquisition.h')]),
]

version = '5.6.dev0'
version = '5.6'


setup(name='AccessControl',
Expand Down
1 change: 0 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ envlist =

[testenv]
usedevelop = true
pip_pre = py311: true
deps =
setenv =
pure: PURE_PYTHON=1
Expand Down

0 comments on commit 61da8b4

Please sign in to comment.