Skip to content

Commit a6fc65e

Browse files
committed
- use the latest meta/config templates
1 parent 64e4d16 commit a6fc65e

File tree

7 files changed

+44
-70
lines changed

7 files changed

+44
-70
lines changed

.coveragerc

Lines changed: 0 additions & 30 deletions
This file was deleted.

.github/workflows/tests.yml

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -152,13 +152,7 @@ jobs:
152152
restore-keys: |
153153
${{ runner.os }}-pip-
154154
155-
- name: Install Build Dependencies (3.13)
156-
if: matrix.python-version == '3.13'
157-
run: |
158-
pip install -U pip
159-
pip install -U "setuptools <74" wheel twine
160155
- name: Install Build Dependencies
161-
if: matrix.python-version != '3.13'
162156
run: |
163157
pip install -U pip
164158
pip install -U "setuptools <74" wheel twine
@@ -199,15 +193,7 @@ jobs:
199193
python setup.py build_ext -i
200194
python setup.py bdist_wheel
201195
202-
- name: Install zope.interface and dependencies (3.13)
203-
if: matrix.python-version == '3.13'
204-
run: |
205-
# Install to collect dependencies into the (pip) cache.
206-
# Use "--pre" here because dependencies with support for this future
207-
# Python release may only be available as pre-releases
208-
pip install --pre .[test]
209196
- name: Install zope.interface and dependencies
210-
if: matrix.python-version != '3.13'
211197
run: |
212198
# Install to collect dependencies into the (pip) cache.
213199
pip install .[test]
@@ -250,7 +236,6 @@ jobs:
250236
&& startsWith(github.ref, 'refs/tags')
251237
&& !startsWith(runner.os, 'Linux')
252238
&& !startsWith(matrix.python-version, 'pypy')
253-
&& !startsWith(matrix.python-version, '3.13')
254239
env:
255240
TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
256241
run: |
@@ -426,7 +411,7 @@ jobs:
426411
- name: Install zope.interface
427412
run: |
428413
pip install -U wheel
429-
pip install -U coverage
414+
pip install -U coverage[toml]
430415
pip install -U "`ls dist/zope.interface-*.whl`[docs]"
431416
- name: Build docs
432417
env:
@@ -522,8 +507,6 @@ jobs:
522507
name: manylinux_${{ matrix.image }}_wheels.zip
523508
- name: Restore pip cache permissions
524509
run: sudo chown -R $(whoami) ${{ steps.pip-cache-default.outputs.dir }}
525-
- name: Prevent publishing wheels for unreleased Python versions
526-
run: VER=$(echo '3.13' | tr -d .) && ls -al wheelhouse && sudo rm -f wheelhouse/*-cp${VER}*.whl && ls -al wheelhouse
527510
- name: Publish package to PyPI
528511
uses: pypa/gh-action-pypi-publish@release/v1
529512
if: >

.manylinux-install.sh

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,32 +28,27 @@ yum -y install libffi-devel
2828

2929
tox_env_map() {
3030
case $1 in
31-
*"cp313"*) echo 'py313';;
3231
*"cp38"*) echo 'py38';;
3332
*"cp39"*) echo 'py39';;
3433
*"cp310"*) echo 'py310';;
3534
*"cp311"*) echo 'py311';;
3635
*"cp312"*) echo 'py312';;
36+
*"cp313"*) echo 'py313';;
3737
*) echo 'py';;
3838
esac
3939
}
4040

4141
# Compile wheels
4242
for PYBIN in /opt/python/*/bin; do
4343
if \
44-
[[ "${PYBIN}" == *"cp313/"* ]] || \
45-
[[ "${PYBIN}" == *"cp311/"* ]] || \
46-
[[ "${PYBIN}" == *"cp312/"* ]] || \
4744
[[ "${PYBIN}" == *"cp38/"* ]] || \
4845
[[ "${PYBIN}" == *"cp39/"* ]] || \
49-
[[ "${PYBIN}" == *"cp310/"* ]] ; then
50-
if [[ "${PYBIN}" == *"cp313/"* ]] ; then
51-
"${PYBIN}/pip" install --pre -e /io/
52-
"${PYBIN}/pip" wheel /io/ --pre -w wheelhouse/
53-
else
54-
"${PYBIN}/pip" install -e /io/
55-
"${PYBIN}/pip" wheel /io/ -w wheelhouse/
56-
fi
46+
[[ "${PYBIN}" == *"cp310/"* ]] || \
47+
[[ "${PYBIN}" == *"cp311/"* ]] || \
48+
[[ "${PYBIN}" == *"cp312/"* ]] || \
49+
[[ "${PYBIN}" == *"cp313/"* ]] ; then
50+
"${PYBIN}/pip" install -e /io/
51+
"${PYBIN}/pip" wheel /io/ -w wheelhouse/
5752
if [ `uname -m` == 'aarch64' ]; then
5853
cd /io/
5954
${PYBIN}/pip install tox

.meta.toml

Lines changed: 2 additions & 2 deletions
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 = "acd39fc2"
5+
commit-id = "32ea0a11"
66

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

MANIFEST.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ include *.txt
66
include buildout.cfg
77
include tox.ini
88
include .pre-commit-config.yaml
9-
include .coveragerc
109

1110
recursive-include docs *.py
1211
recursive-include docs *.rst

pyproject.toml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#
2+
# Generated from:
3+
# https://github.com/zopefoundation/meta/tree/master/config/c-code
4+
5+
[build-system]
6+
requires = ["setuptools<74"]
7+
build-backend = "setuptools.build_meta"
8+
9+
[tool.coverage.run]
10+
branch = true
11+
source = ["zope.interface"]
12+
relative_files = true
13+
14+
[tool.coverage.report]
15+
fail_under = 99
16+
precision = 2
17+
ignore_errors = true
18+
show_missing = true
19+
exclude_lines = ["pragma: no cover", "pragma: nocover", "except ImportError:", "raise NotImplementedError", "if __name__ == '__main__':", "self.fail", "raise AssertionError", "raise unittest.Skip"]
20+
21+
[tool.coverage.html]
22+
directory = "parts/htmlcov"
23+
24+
[tool.coverage.paths]
25+
source = ["src/", ".tox/*/lib/python*/site-packages/", ".tox/pypy*/site-packages/"]

tox.ini

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,36 +15,37 @@ envlist =
1515
coverage
1616

1717
[testenv]
18-
pip_pre = py313: true
1918
deps =
2019
setuptools <74
21-
Sphinx
2220
setenv =
2321
pure: PURE_PYTHON=1
2422
!pure-!pypy3: PURE_PYTHON=0
2523
ZOPE_INTERFACE_STRICT_IRO=1
26-
py312: VIRTUALENV_PIP=23.1.2
27-
py312: PIP_REQUIRE_VIRTUALENV=0
2824
commands =
2925
coverage run -p -m unittest discover -s src {posargs}
3026
sphinx-build -b doctest -d {envdir}/.cache/doctrees docs {envdir}/.cache/doctest
3127
extras =
3228
test
3329
docs
3430

31+
[testenv:setuptools-latest]
32+
basepython = python3
33+
deps =
34+
git+https://github.com/pypa/setuptools.git\#egg=setuptools
35+
3536
[testenv:coverage]
3637
basepython = python3
3738
allowlist_externals =
3839
mkdir
3940
deps =
40-
coverage
41+
coverage[toml]
4142
setenv =
4243
PURE_PYTHON=1
4344
commands =
4445
mkdir -p {toxinidir}/parts/htmlcov
4546
coverage combine
46-
coverage html -i
47-
coverage report -i -m --fail-under=99
47+
coverage html
48+
coverage report
4849
depends = py38,py38-pure,py39,py39-pure,py310,py310-pure,py311,py311-pure,py312,py312-pure,py313,py313-pure,pypy3,docs
4950
parallel_show_output = true
5051

@@ -53,6 +54,7 @@ description = ensure that the distribution is ready to release
5354
basepython = python3
5455
skip_install = true
5556
deps =
57+
setuptools <74
5658
twine
5759
build
5860
check-manifest

0 commit comments

Comments
 (0)