Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated from:
# https://github.com/zopefoundation/meta/tree/master/config/c-code
#
#
# EditorConfig Configuration file, for more details see:
# https://EditorConfig.org
# EditorConfig is a convention description, that could be interpreted
Expand All @@ -12,7 +12,7 @@
root = true


[*] # For All Files
[*]
# Unix-style newlines with a newline ending every file
end_of_line = lf
insert_final_newline = true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
name: linting
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- uses: actions/setup-python@v6
with:
python-version: '3.13'
Expand Down
45 changes: 5 additions & 40 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,15 +98,14 @@ jobs:
- "3.12"
- "3.13"
- "3.14"
- "3.15"
os: [ubuntu-latest, macos-latest, windows-latest]
exclude:
- os: macos-latest
python-version: "pypy-3.11"

steps:
- name: checkout
uses: actions/checkout@v5
uses: actions/checkout@v6
with:
persist-credentials: false
- name: Set up Python ${{ matrix.python-version }}
Expand Down Expand Up @@ -150,13 +149,7 @@ jobs:
restore-keys: |
${{ runner.os }}-pip-

- name: Install Build Dependencies (3.15)
if: matrix.python-version == '3.15'
run: |
pip install -U pip
pip install -U "setuptools >= 78.1.1,< 81" wheel twine
- name: Install Build Dependencies
if: matrix.python-version != '3.15'
run: |
pip install -U pip
pip install -U "setuptools >= 78.1.1,< 81" wheel twine
Expand Down Expand Up @@ -197,15 +190,7 @@ jobs:
python setup.py build_ext -i
python setup.py bdist_wheel

- name: Install zope.security and dependencies (3.15)
if: matrix.python-version == '3.15'
run: |
# Install to collect dependencies into the (pip) cache.
# Use "--pre" here because dependencies with support for this future
# Python release may only be available as pre-releases
pip install --pre .[test]
- name: Install zope.security and dependencies
if: matrix.python-version != '3.15'
run: |
# Install to collect dependencies into the (pip) cache.
pip install -U pip "setuptools >= 78.1.1,< 81"
Expand Down Expand Up @@ -254,15 +239,14 @@ jobs:
- "3.12"
- "3.13"
- "3.14"
- "3.15"
os: [ubuntu-latest, macos-latest, windows-latest]
exclude:
- os: macos-latest
python-version: "pypy-3.11"

steps:
- name: checkout
uses: actions/checkout@v5
uses: actions/checkout@v6
with:
persist-credentials: false
- name: Set up Python ${{ matrix.python-version }}
Expand Down Expand Up @@ -311,23 +295,7 @@ jobs:
with:
name: zope.security-${{ runner.os }}-${{ matrix.python-version }}.whl
path: dist/
- name: Install zope.security ${{ matrix.python-version }}
if: matrix.python-version == '3.15'
run: |
pip install -U wheel "setuptools >= 78.1.1,< 81"
# 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[toml]
# 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?
ls -l dist/
unzip -n dist/*.whl -d src
# Use "--pre" here because dependencies with support for this future
# Python release may only be available as pre-releases
pip install --pre -e .[test]
- name: Install zope.security
if: matrix.python-version != '3.15'
run: |
pip install -U wheel "setuptools >= 78.1.1,< 81"
pip install -U coverage[toml]
Expand Down Expand Up @@ -378,7 +346,7 @@ jobs:

steps:
- name: checkout
uses: actions/checkout@v5
uses: actions/checkout@v6
with:
persist-credentials: false
- name: Set up Python ${{ matrix.python-version }}
Expand Down Expand Up @@ -449,7 +417,7 @@ jobs:

steps:
- name: checkout
uses: actions/checkout@v5
uses: actions/checkout@v6
with:
persist-credentials: false
- name: Set up Python ${{ matrix.python-version }}
Expand Down Expand Up @@ -527,7 +495,7 @@ jobs:
python-version: "3.13"
steps:
- name: checkout
uses: actions/checkout@v5
uses: actions/checkout@v6
with:
persist-credentials: false
- name: Set up Python ${{ matrix.python-version }}
Expand Down Expand Up @@ -600,9 +568,6 @@ jobs:
- name: Restore pip cache permissions
run: sudo chown -R $(whoami) ${{ steps.pip-cache-default.outputs.dir }}

- name: Prevent publishing wheels for unreleased Python versions
run: VER=$(echo '3.15' | tr -d .) && ls -al wheelhouse && sudo rm -f wheelhouse/*-cp${VER}*.whl && ls -al wheelhouse

publish:
name: Publish to PyPI
runs-on: ubuntu-latest
Expand Down
13 changes: 3 additions & 10 deletions .manylinux-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ tox_env_map() {
*"cp312"*) echo 'py312';;
*"cp313"*) echo 'py313';;
*"cp314"*) echo 'py314';;
*"cp315"*) echo 'py315';;
*) echo 'py';;
esac
}
Expand All @@ -45,15 +44,9 @@ for PYBIN in /opt/python/*/bin; do
[[ "${PYBIN}" == *"cp311/"* ]] || \
[[ "${PYBIN}" == *"cp312/"* ]] || \
[[ "${PYBIN}" == *"cp313/"* ]] || \
[[ "${PYBIN}" == *"cp314/"* ]] || \
[[ "${PYBIN}" == *"cp315/"* ]] ; then
if [[ "${PYBIN}" == *"cp315/"* ]] ; 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}" == *"cp314/"* ]] ; then
"${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,12 +2,12 @@
# https://github.com/zopefoundation/meta/tree/master/config/c-code
[meta]
template = "c-code"
commit-id = "9fcd3d67"
commit-id = "24cb1653"

[python]
with-windows = true
with-pypy = true
with-future-python = true
with-future-python = false
with-docs = true
with-sphinx-doctests = true
with-macos = false
Expand Down
3 changes: 0 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,14 @@ envlist =
py312,py312-pure
py313,py313-pure
py314,py314-pure
py315,py315-pure
pypy3
docs
coverage
py312-watch, py314-watch

[testenv]
pip_pre = py315: true
deps =
setuptools >= 78.1.1,< 81
Sphinx
setenv =
pure: PURE_PYTHON=1
!pure-!pypy3: PURE_PYTHON=0
Expand Down