Skip to content

Commit e6131b9

Browse files
committed
- use latest zope.meta templates
1 parent 58757ea commit e6131b9

File tree

6 files changed

+33
-32
lines changed

6 files changed

+33
-32
lines changed

.github/workflows/pre-commit.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ jobs:
2121
name: linting
2222
runs-on: ubuntu-latest
2323
steps:
24-
- uses: actions/checkout@v4
25-
- uses: actions/setup-python@v5
24+
- uses: actions/checkout@v5
25+
- uses: actions/setup-python@v6
2626
with:
2727
python-version: 3.x
2828
- uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd #v3.0.1

.github/workflows/tests.yml

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,6 @@ env:
5656
ZOPE_INTERFACE_STRICT_IRO: 1
5757

5858
PIP_UPGRADE_STRATEGY: eager
59-
# Don't get warnings about Python 2 support being deprecated. We
60-
# know. The env var works for pip 20.
61-
PIP_NO_PYTHON_VERSION_WARNING: 1
62-
PIP_NO_WARN_SCRIPT_LOCATION: 1
6359

6460
CFLAGS: -O3 -pipe
6561
CXXFLAGS: -O3 -pipe
@@ -96,7 +92,7 @@ jobs:
9692
fail-fast: false
9793
matrix:
9894
python-version:
99-
- "pypy-3.10"
95+
- "pypy-3.11"
10096
- "3.9"
10197
- "3.10"
10298
- "3.11"
@@ -106,15 +102,15 @@ jobs:
106102
os: [ubuntu-latest, macos-latest, windows-latest]
107103
exclude:
108104
- os: macos-latest
109-
python-version: "pypy-3.10"
105+
python-version: "pypy-3.11"
110106

111107
steps:
112108
- name: checkout
113-
uses: actions/checkout@v4
109+
uses: actions/checkout@v5
114110
with:
115111
persist-credentials: false
116112
- name: Set up Python ${{ matrix.python-version }}
117-
uses: actions/setup-python@v5
113+
uses: actions/setup-python@v6
118114
with:
119115
python-version: ${{ matrix.python-version }}
120116
allow-prereleases: true
@@ -158,12 +154,12 @@ jobs:
158154
if: matrix.python-version == '3.14'
159155
run: |
160156
pip install -U pip
161-
pip install -U "setuptools <= 75.6.0" wheel twine
157+
pip install -U "setuptools >= 78.1.1,< 81" wheel twine
162158
- name: Install Build Dependencies
163159
if: matrix.python-version != '3.14'
164160
run: |
165161
pip install -U pip
166-
pip install -U "setuptools <= 75.6.0" wheel twine
162+
pip install -U "setuptools >= 78.1.1,< 81" wheel twine
167163
168164
- name: Build Persistence (macOS x86_64)
169165
if: >
@@ -212,6 +208,7 @@ jobs:
212208
if: matrix.python-version != '3.14'
213209
run: |
214210
# Install to collect dependencies into the (pip) cache.
211+
pip install -U pip "setuptools >= 78.1.1,< 81"
215212
pip install .[test]
216213
217214
- name: Check Persistence build
@@ -265,7 +262,7 @@ jobs:
265262
fail-fast: false
266263
matrix:
267264
python-version:
268-
- "pypy-3.10"
265+
- "pypy-3.11"
269266
- "3.9"
270267
- "3.10"
271268
- "3.11"
@@ -275,15 +272,15 @@ jobs:
275272
os: [ubuntu-latest, macos-latest, windows-latest]
276273
exclude:
277274
- os: macos-latest
278-
python-version: "pypy-3.10"
275+
python-version: "pypy-3.11"
279276

280277
steps:
281278
- name: checkout
282-
uses: actions/checkout@v4
279+
uses: actions/checkout@v5
283280
with:
284281
persist-credentials: false
285282
- name: Set up Python ${{ matrix.python-version }}
286-
uses: actions/setup-python@v5
283+
uses: actions/setup-python@v6
287284
with:
288285
python-version: ${{ matrix.python-version }}
289286
allow-prereleases: true
@@ -331,27 +328,29 @@ jobs:
331328
- name: Install Persistence ${{ matrix.python-version }}
332329
if: matrix.python-version == '3.14'
333330
run: |
334-
pip install -U wheel "setuptools <= 75.6.0"
331+
pip install -U wheel "setuptools >= 78.1.1,< 81"
335332
# coverage might have a wheel on PyPI for a future python version which is
336333
# not ABI compatible with the current one, so build it from sdist:
337334
pip install -U --no-binary :all: coverage[toml]
338335
# Unzip into src/ so that testrunner can find the .so files
339336
# when we ask it to load tests from that directory. This
340337
# might also save some build time?
341-
unzip -n dist/Persistence-*whl -d src
338+
ls -l dist/
339+
unzip -n dist/*.whl -d src
342340
# Use "--pre" here because dependencies with support for this future
343341
# Python release may only be available as pre-releases
344342
pip install --pre -e .[test]
345343
- name: Install Persistence
346344
if: matrix.python-version != '3.14'
347345
run: |
348-
pip install -U wheel "setuptools <= 75.6.0"
346+
pip install -U wheel "setuptools >= 78.1.1,< 81"
349347
pip install -U coverage[toml]
350348
pip install -U 'cffi; platform_python_implementation == "CPython"'
351349
# Unzip into src/ so that testrunner can find the .so files
352350
# when we ask it to load tests from that directory. This
353351
# might also save some build time?
354-
unzip -n dist/Persistence-*whl -d src
352+
ls -l dist/
353+
unzip -n dist/*.whl -d src
355354
pip install -e .[test]
356355
- name: Run tests with C extensions
357356
if: ${{ !startsWith(matrix.python-version, 'pypy') }}
@@ -393,11 +392,11 @@ jobs:
393392

394393
steps:
395394
- name: checkout
396-
uses: actions/checkout@v4
395+
uses: actions/checkout@v5
397396
with:
398397
persist-credentials: false
399398
- name: Set up Python ${{ matrix.python-version }}
400-
uses: actions/setup-python@v5
399+
uses: actions/setup-python@v6
401400
with:
402401
python-version: ${{ matrix.python-version }}
403402
allow-prereleases: true
@@ -446,7 +445,7 @@ jobs:
446445
run: |
447446
pip install -U wheel
448447
pip install -U tox
449-
pip install -U "`ls dist/Persistence-*.whl`[docs]"
448+
pip install -U "`ls dist/*.whl`[docs]"
450449
- name: Run release check
451450
env:
452451
ZOPE_INTERFACE_STRICT_IRO: 1
@@ -464,11 +463,11 @@ jobs:
464463

465464
steps:
466465
- name: checkout
467-
uses: actions/checkout@v4
466+
uses: actions/checkout@v5
468467
with:
469468
persist-credentials: false
470469
- name: Set up Python ${{ matrix.python-version }}
471-
uses: actions/setup-python@v5
470+
uses: actions/setup-python@v6
472471
with:
473472
python-version: ${{ matrix.python-version }}
474473
allow-prereleases: true

.meta.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# https://github.com/zopefoundation/meta/tree/master/config/c-code
33
[meta]
44
template = "c-code"
5-
commit-id = "3c1c588c"
5+
commit-id = "bfe21cd9"
66

77
[python]
88
with-windows = true

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
minimum_pre_commit_version: '3.6'
44
repos:
55
- repo: https://github.com/pycqa/isort
6-
rev: "6.0.0"
6+
rev: "6.0.1"
77
hooks:
88
- id: isort
99
- repo: https://github.com/hhatto/autopep8
@@ -12,7 +12,7 @@ repos:
1212
- id: autopep8
1313
args: [--in-place, --aggressive, --aggressive]
1414
- repo: https://github.com/asottile/pyupgrade
15-
rev: v3.19.1
15+
rev: v3.20.0
1616
hooks:
1717
- id: pyupgrade
1818
args: [--py39-plus]
@@ -21,7 +21,7 @@ repos:
2121
hooks:
2222
- id: teyit
2323
- repo: https://github.com/PyCQA/flake8
24-
rev: "7.1.1"
24+
rev: "7.3.0"
2525
hooks:
2626
- id: flake8
2727
additional_dependencies:

pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44

55
[build-system]
66
requires = [
7-
"setuptools <= 75.6.0",
7+
"setuptools",
8+
"wheel",
89
]
910
build-backend = "setuptools.build_meta"
1011

tox.ini

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ envlist =
1717
[testenv]
1818
pip_pre = py314: true
1919
deps =
20-
setuptools <= 75.6.0
20+
setuptools >= 78.1.1,< 81
2121
wheel
2222
setenv =
2323
pure: PURE_PYTHON=1
@@ -54,7 +54,8 @@ description = ensure that the distribution is ready to release
5454
basepython = python3
5555
skip_install = true
5656
deps =
57-
setuptools <= 75.6.0
57+
setuptools
58+
wheel
5859
twine
5960
build
6061
check-manifest

0 commit comments

Comments
 (0)