Skip to content

Commit

Permalink
- apply latest meta config template fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
dataflake committed May 29, 2024
1 parent ae4ea6c commit af92afe
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 16 deletions.
8 changes: 3 additions & 5 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,7 @@ jobs:
run: |
pip install -U pip
pip install -U "setuptools<69" wheel twine
# Remove this hack once 'cffi' has a release supporting Python 3.13.
pip install -e "git+https://github.com/python-cffi/cffi.git#egg=cffi"
pip install --pre cffi
- name: Install Build Dependencies
if: matrix.python-version != '3.13'
run: |
Expand Down Expand Up @@ -328,12 +327,11 @@ jobs:
with:
name: zope.security-${{ runner.os }}-${{ matrix.python-version }}.whl
path: dist/
- name: Install zope.security 3.13 ${{ matrix.python-version }}
- name: Install zope.security ${{ matrix.python-version }}
if: matrix.python-version == '3.13'
run: |
pip install -U wheel "setuptools<69"
# Remove this hack once 'cffi' has a release supporting Python 3.13.
pip install -e "git+https://github.com/python-cffi/cffi.git#egg=cffi"
pip install --pre cffi
# coverage might have 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
Expand Down
9 changes: 3 additions & 6 deletions .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 = "9f78efd3"
commit-id = "13719585"

[python]
with-appveyor = true
Expand All @@ -16,15 +16,12 @@ with-macos = false
[tox]
use-flake8 = true
additional-envlist = [
"py37-watch, py311-watch",
"py38-watch, py311-watch",
]
testenv-setenv = [
"ZOPE_INTERFACE_STRICT_IRO=1",
"watch: ZOPE_WATCH_CHECKERS=1",
]
testenv-deps = [
"py37: urllib3 < 2",
]

[coverage]
fail-under = 99.5
Expand Down Expand Up @@ -57,7 +54,7 @@ additional-config = [

[github-actions]
additional-config = [
"- [\"3.7\", \"py37-watch\"]",
"- [\"3.8\", \"py38-watch\"]",
"- [\"3.11\", \"py311-watch\"]",
]
additional-build-dependencies = [
Expand Down
2 changes: 1 addition & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Changes
=========

6.3 (unreleased)
7.0 (unreleased)
----------------

- Add preliminary support for Python 3.13 as of 3.13b1.
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def read(*rnames):


setup(name='zope.security',
version='6.3.dev0',
version='7.0.dev0',
author='Zope Foundation and Contributors',
author_email='zope-dev@zope.org',
description='Zope Security Framework',
Expand Down
4 changes: 1 addition & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,13 @@ envlist =
pypy3
docs
coverage
py37-watch, py311-watch
py38-watch, py311-watch

[testenv]
usedevelop = true
pip_pre = py313: true
deps =
setuptools < 69
py37: urllib3 < 2
Sphinx
setenv =
pure: PURE_PYTHON=1
Expand All @@ -42,7 +41,6 @@ allowlist_externals =
mkdir
deps =
coverage
py37: urllib3 < 2
setenv =
PURE_PYTHON=1
commands =
Expand Down

0 comments on commit af92afe

Please sign in to comment.