Skip to content

Commit cd578dd

Browse files
authored
Remove preliminary support for Python 3.13 as it is not yet ready. (#145)
1 parent 738db73 commit cd578dd

File tree

6 files changed

+4
-60
lines changed

6 files changed

+4
-60
lines changed

.github/workflows/tests.yml

-42
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ jobs:
102102
- "3.10"
103103
- "3.11"
104104
- "3.12"
105-
- "3.13.0-alpha - 3.13.0"
106105
os: [ubuntu-20.04, macos-11]
107106

108107
steps:
@@ -131,17 +130,7 @@ jobs:
131130
restore-keys: |
132131
${{ runner.os }}-pip-
133132
134-
- name: Install Build Dependencies (3.13.0-alpha - 3.13.0)
135-
if: matrix.python-version == '3.13.0-alpha - 3.13.0'
136-
run: |
137-
pip install -U pip
138-
pip install -U setuptools wheel twine
139-
# cffi will probably have no public release until a Python 3.13 beta
140-
# or even RC release, see https://github.com/python-cffi/cffi/issues/23
141-
echo "cffi @ git+https://github.com/python-cffi/cffi.git@954cab4f889fb019a7f90df153ee1be501495f58" > cffi_constraint.txt
142-
PIP_CONSTRAINT=cffi_constraint.txt pip install cffi
143133
- name: Install Build Dependencies
144-
if: matrix.python-version != '3.13.0-alpha - 3.13.0'
145134
run: |
146135
pip install -U pip
147136
pip install -U setuptools wheel twine cffi
@@ -185,18 +174,7 @@ jobs:
185174
python setup.py build_ext -i
186175
python setup.py bdist_wheel
187176
188-
- name: Install AccessControl and dependencies (3.13.0-alpha - 3.13.0)
189-
if: matrix.python-version == '3.13.0-alpha - 3.13.0'
190-
run: |
191-
# Install to collect dependencies into the (pip) cache.
192-
# cffi will probably have no public release until a Python 3.13 beta
193-
# or even RC release, see https://github.com/python-cffi/cffi/issues/23
194-
echo "cffi @ git+https://github.com/python-cffi/cffi.git@954cab4f889fb019a7f90df153ee1be501495f58" > cffi_constraint.txt
195-
# Use "--pre" here because dependencies with support for this future
196-
# Python release may only be available as pre-releases
197-
PIP_CONSTRAINT=cffi_constraint.txt pip install --pre .[test]
198177
- name: Install AccessControl and dependencies
199-
if: matrix.python-version != '3.13.0-alpha - 3.13.0'
200178
run: |
201179
# Install to collect dependencies into the (pip) cache.
202180
pip install .[test]
@@ -240,7 +218,6 @@ jobs:
240218
&& startsWith(github.ref, 'refs/tags')
241219
&& startsWith(runner.os, 'Mac')
242220
&& !startsWith(matrix.python-version, 'pypy')
243-
&& !startsWith(matrix.python-version, '3.13.0-alpha - 3.13.0')
244221
env:
245222
TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
246223
run: |
@@ -259,7 +236,6 @@ jobs:
259236
- "3.10"
260237
- "3.11"
261238
- "3.12"
262-
- "3.13.0-alpha - 3.13.0"
263239
os: [ubuntu-20.04, macos-11]
264240

265241
steps:
@@ -293,25 +269,7 @@ jobs:
293269
with:
294270
name: AccessControl-${{ runner.os }}-${{ matrix.python-version }}.whl
295271
path: dist/
296-
- name: Install AccessControl 3.13.0-alpha - 3.13.0
297-
if: ${{ startsWith(matrix.python-version, '3.13.0-alpha - 3.13.0') }}
298-
run: |
299-
pip install -U wheel setuptools
300-
# cffi will probably have no public release until a beta or even RC
301-
# version of Python 3.13, see https://github.com/python-cffi/cffi/issues/23
302-
echo 'cffi @ git+https://github.com/python-cffi/cffi.git@954cab4f889fb019a7f90df153ee1be501495f58 ; platform_python_implementation == "CPython"' > cffi_constraint.txt
303-
# coverage has a wheel on PyPI for a future python version which is
304-
# not ABI compatible with the current one, so build it from sdist:
305-
pip install -U --no-binary :all: coverage
306-
# Unzip into src/ so that testrunner can find the .so files
307-
# when we ask it to load tests from that directory. This
308-
# might also save some build time?
309-
unzip -n dist/AccessControl-*whl -d src
310-
# Use "--pre" here because dependencies with support for this future
311-
# Python release may only be available as pre-releases
312-
PIP_CONSTRAINT=cffi_constraint.txt pip install --pre -U -e .[test]
313272
- name: Install AccessControl
314-
if: ${{ !startsWith(matrix.python-version, '3.13.0-alpha - 3.13.0') }}
315273
run: |
316274
pip install -U wheel setuptools
317275
pip install -U coverage

.manylinux-install.sh

+2-9
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ yum -y install libffi-devel
2828

2929
tox_env_map() {
3030
case $1 in
31-
*"cp313"*) echo 'py313';;
3231
*"cp37"*) echo 'py37';;
3332
*"cp38"*) echo 'py38';;
3433
*"cp39"*) echo 'py39';;
@@ -42,20 +41,14 @@ tox_env_map() {
4241
# Compile wheels
4342
for PYBIN in /opt/python/*/bin; do
4443
if \
45-
[[ "${PYBIN}" == *"cp313"* ]] || \
4644
[[ "${PYBIN}" == *"cp311"* ]] || \
4745
[[ "${PYBIN}" == *"cp312"* ]] || \
4846
[[ "${PYBIN}" == *"cp37"* ]] || \
4947
[[ "${PYBIN}" == *"cp38"* ]] || \
5048
[[ "${PYBIN}" == *"cp39"* ]] || \
5149
[[ "${PYBIN}" == *"cp310"* ]] ; then
52-
if [[ "${PYBIN}" == *"cp313"* ]] ; then
53-
"${PYBIN}/pip" install --pre -e /io/
54-
"${PYBIN}/pip" wheel /io/ --pre -w wheelhouse/
55-
else
56-
"${PYBIN}/pip" install -e /io/
57-
"${PYBIN}/pip" wheel /io/ -w wheelhouse/
58-
fi
50+
"${PYBIN}/pip" install -e /io/
51+
"${PYBIN}/pip" wheel /io/ -w wheelhouse/
5952
if [ `uname -m` == 'aarch64' ]; then
6053
cd /io/
6154
${PYBIN}/pip install tox

.meta.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
# https://github.com/zopefoundation/meta/tree/master/config/c-code
33
[meta]
44
template = "c-code"
5-
commit-id = "fc37b50c"
5+
commit-id = "1351c95d"
66

77
[python]
88
with-appveyor = true
99
with-windows = false
1010
with-pypy = false
11-
with-future-python = true
11+
with-future-python = false
1212
with-sphinx-doctests = false
1313
with-macos = false
1414

appveyor.yml

-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ environment:
1616
- python: 310-x64
1717
- python: 311-x64
1818
- python: 312-x64
19-
# `multibuild` cannot install non-final versions as they are not on
20-
# ftp.python.org, so we skip Python 3.13 until its final release:
21-
# - python: 313-x64
2219

2320
install:
2421
- "SET PYTHONVERSION=%PYTHON%"

setup.cfg

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
# Generated from:
22
# https://github.com/zopefoundation/meta/tree/master/config/c-code
3-
[bdist_wheel]
4-
universal = 0
53

64
[zest.releaser]
75
create-wheel = no

tox.ini

-2
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,10 @@ envlist =
1010
py310,py310-pure
1111
py311,py311-pure
1212
py312,py312-pure
13-
py313,py313-pure
1413
coverage
1514

1615
[testenv]
1716
usedevelop = true
18-
pip_pre = py313: true
1917
deps =
2018
setenv =
2119
pure: PURE_PYTHON=1

0 commit comments

Comments
 (0)