Skip to content

Update zope.meta templates, support Windows/ARM64 and source dists #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dataflake merged 2 commits into from
Apr 30, 2026
Merged

Update zope.meta templates, support Windows/ARM64 and source dists #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d13b001
Update zope.meta templates, support Windows/ARM64 and source dists
dataflake Apr 28, 2026
7b40612
Fix GHA sdist artifact name
dataflake Apr 29, 2026
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
137 changes: 86 additions & 51 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,14 @@ jobs:
- "3.13"
- "3.14"
- "3.15"
os: [ubuntu-latest, macos-latest, windows-latest]
os: [ubuntu-latest, macos-latest, windows-latest, windows-11-arm]
exclude:
- os: macos-latest
python-version: "pypy-3.11"
- os: windows-11-arm
python-version: "pypy-3.11"
- os: windows-11-arm
python-version: "3.10"

steps:
- name: checkout
Expand Down Expand Up @@ -129,33 +133,33 @@ jobs:
echo "dir=$(pip cache dir)" >> $Env:GITHUB_OUTPUT

- name: pip cache (default)
uses: actions/cache@v4
uses: actions/cache@v5
if: ${{ !startsWith(runner.os, 'Windows') }}
with:
path: ${{ steps.pip-cache-default.outputs.dir }}
key: ${{ runner.os }}-pip-${{ matrix.python-version }}
key: ${{ runner.os }}-${{ runner.arch }}-pip-${{ matrix.python-version }}
restore-keys: |
${{ runner.os }}-pip-
${{ runner.os }}-${{ runner.arch }}-pip-

- name: pip cache (Windows)
uses: actions/cache@v4
uses: actions/cache@v5
if: ${{ startsWith(runner.os, 'Windows') }}
with:
path: ${{ steps.pip-cache-windows.outputs.dir }}
key: ${{ runner.os }}-pip-${{ matrix.python-version }}
key: ${{ runner.os }}-${{ runner.arch }}-pip-${{ matrix.python-version }}
restore-keys: |
${{ runner.os }}-pip-
${{ runner.os }}-${{ runner.arch }}-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
pip install -U "setuptools >= 78.1.1,< 82" 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
pip install -U "setuptools >= 78.1.1,< 82" wheel twine

- name: Build zope.proxy (macOS x86_64)
if: >
Expand Down Expand Up @@ -193,6 +197,13 @@ jobs:
python setup.py build_ext -i
python setup.py bdist_wheel

- name: Create zope.proxy sdist
if: >
startsWith(runner.os, 'Linux')
&& matrix.python-version == '3.14'
run: |
python setup.py sdist

- name: Install zope.proxy and dependencies (3.15)
if: matrix.python-version == '3.15'
run: |
Expand All @@ -204,7 +215,7 @@ jobs:
if: matrix.python-version != '3.15'
run: |
# Install to collect dependencies into the (pip) cache.
pip install -U pip "setuptools >= 78.1.1,< 81"
pip install -U pip "setuptools >= 78.1.1,< 82"
pip install .[test]

- name: Check zope.proxy build
Expand All @@ -214,7 +225,7 @@ jobs:
- name: Upload zope.proxy wheel (macOS x86_64)
if: >
startsWith(runner.os, 'Mac')
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
# The x86_64 wheel is uploaded with a different name just so it can be
# manually downloaded when desired. The wheel itself *cannot* be tested
Expand All @@ -225,18 +236,33 @@ jobs:
if: >
startsWith(runner.os, 'Mac')
&& !startsWith(matrix.python-version, 'pypy')
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: zope.proxy-${{ runner.os }}-${{ matrix.python-version }}.whl
path: dist/*arm64.whl
- name: Upload zope.proxy wheel (all other platforms)
if: >
!startsWith(runner.os, 'Mac')
uses: actions/upload-artifact@v4
- name: Upload zope.proxy wheel (Windows)
if: startsWith(runner.os, 'Windows')
uses: actions/upload-artifact@v7
with:
name: zope.proxy-${{ runner.os }}-${{ matrix.python-version }}-${{ runner.arch }}.whl
path: dist/*whl

- name: Upload zope.proxy wheel (Linux)
if: startsWith(runner.os, 'Linux')
uses: actions/upload-artifact@v7
with:
name: zope.proxy-${{ runner.os }}-${{ matrix.python-version }}.whl
path: dist/*whl

- name: Upload zope.proxy sdist
if: >
startsWith(runner.os, 'Linux')
&& matrix.python-version == '3.14'
uses: actions/upload-artifact@v7
with:
name: zope.proxy.tar.gz
path: dist/*gz

test:
needs: build-package
runs-on: ${{ matrix.os }}
Expand All @@ -251,10 +277,14 @@ jobs:
- "3.13"
- "3.14"
- "3.15"
os: [ubuntu-latest, macos-latest, windows-latest]
os: [ubuntu-latest, macos-latest, windows-latest, windows-11-arm]
exclude:
- os: macos-latest
python-version: "pypy-3.11"
- os: windows-11-arm
python-version: "pypy-3.11"
- os: windows-11-arm
python-version: "3.10"

steps:
- name: checkout
Expand Down Expand Up @@ -285,32 +315,39 @@ jobs:
echo "dir=$(pip cache dir)" >> $Env:GITHUB_OUTPUT

- name: pip cache (default)
uses: actions/cache@v4
uses: actions/cache@v5
if: ${{ !startsWith(runner.os, 'Windows') }}
with:
path: ${{ steps.pip-cache-default.outputs.dir }}
key: ${{ runner.os }}-pip-${{ matrix.python-version }}
key: ${{ runner.os }}-${{ runner.arch }}-pip-${{ matrix.python-version }}
restore-keys: |
${{ runner.os }}-pip-
${{ runner.os }}-${{ runner.arch }}-pip-

- name: pip cache (Windows)
uses: actions/cache@v4
uses: actions/cache@v5
if: ${{ startsWith(runner.os, 'Windows') }}
with:
path: ${{ steps.pip-cache-windows.outputs.dir }}
key: ${{ runner.os }}-pip-${{ matrix.python-version }}
key: ${{ runner.os }}-${{ runner.arch }}-pip-${{ matrix.python-version }}
restore-keys: |
${{ runner.os }}-pip-

- name: Download zope.proxy wheel
uses: actions/download-artifact@v4
${{ runner.os }}-${{ runner.arch }}-pip-
- name: Download zope.proxy wheel (Linux/macOS)
if: "!startsWith(runner.os, 'Windows')"
uses: actions/download-artifact@v8
with:
name: zope.proxy-${{ runner.os }}-${{ matrix.python-version }}.whl
path: dist/

- name: Download zope.proxy wheel (Windows)
if: startsWith(runner.os, 'Windows')
uses: actions/download-artifact@v8
with:
name: zope.proxy-${{ runner.os }}-${{ matrix.python-version }}-${{ runner.arch }}.whl
path: dist/
- name: Install zope.proxy ${{ matrix.python-version }}
if: matrix.python-version == '3.15'
run: |
pip install -U wheel "setuptools >= 78.1.1,< 81"
pip install -U wheel "setuptools >= 78.1.1,< 82"
# 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]
Expand All @@ -325,7 +362,7 @@ jobs:
- name: Install zope.proxy
if: matrix.python-version != '3.15'
run: |
pip install -U wheel "setuptools >= 78.1.1,< 81"
pip install -U wheel "setuptools >= 78.1.1,< 82"
pip install -U coverage[toml]
pip install -U 'cffi; platform_python_implementation == "CPython"'
# Unzip into src/ so that testrunner can find the .so files
Expand Down Expand Up @@ -401,25 +438,24 @@ jobs:
echo "dir=$(pip cache dir)" >> $Env:GITHUB_OUTPUT

- name: pip cache (default)
uses: actions/cache@v4
uses: actions/cache@v5
if: ${{ !startsWith(runner.os, 'Windows') }}
with:
path: ${{ steps.pip-cache-default.outputs.dir }}
key: ${{ runner.os }}-pip-${{ matrix.python-version }}
key: ${{ runner.os }}-${{ runner.arch }}-pip-${{ matrix.python-version }}
restore-keys: |
${{ runner.os }}-pip-
${{ runner.os }}-${{ runner.arch }}-pip-

- name: pip cache (Windows)
uses: actions/cache@v4
uses: actions/cache@v5
if: ${{ startsWith(runner.os, 'Windows') }}
with:
path: ${{ steps.pip-cache-windows.outputs.dir }}
key: ${{ runner.os }}-pip-${{ matrix.python-version }}
key: ${{ runner.os }}-${{ runner.arch }}-pip-${{ matrix.python-version }}
restore-keys: |
${{ runner.os }}-pip-

${{ runner.os }}-${{ runner.arch }}-pip-
- name: Download zope.proxy wheel
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
name: zope.proxy-${{ runner.os }}-${{ matrix.python-version }}.whl
path: dist/
Expand Down Expand Up @@ -472,25 +508,24 @@ jobs:
echo "dir=$(pip cache dir)" >> $Env:GITHUB_OUTPUT

- name: pip cache (default)
uses: actions/cache@v4
uses: actions/cache@v5
if: ${{ !startsWith(runner.os, 'Windows') }}
with:
path: ${{ steps.pip-cache-default.outputs.dir }}
key: ${{ runner.os }}-pip-${{ matrix.python-version }}
key: ${{ runner.os }}-${{ runner.arch }}-pip-${{ matrix.python-version }}
restore-keys: |
${{ runner.os }}-pip-
${{ runner.os }}-${{ runner.arch }}-pip-

- name: pip cache (Windows)
uses: actions/cache@v4
uses: actions/cache@v5
if: ${{ startsWith(runner.os, 'Windows') }}
with:
path: ${{ steps.pip-cache-windows.outputs.dir }}
key: ${{ runner.os }}-pip-${{ matrix.python-version }}
key: ${{ runner.os }}-${{ runner.arch }}-pip-${{ matrix.python-version }}
restore-keys: |
${{ runner.os }}-pip-

${{ runner.os }}-${{ runner.arch }}-pip-
- name: Download zope.proxy wheel
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
name: zope.proxy-${{ runner.os }}-${{ matrix.python-version }}.whl
path: dist/
Expand Down Expand Up @@ -550,22 +585,22 @@ jobs:
echo "dir=$(pip cache dir)" >> $Env:GITHUB_OUTPUT

- name: pip cache (default)
uses: actions/cache@v4
uses: actions/cache@v5
if: ${{ !startsWith(runner.os, 'Windows') }}
with:
path: ${{ steps.pip-cache-default.outputs.dir }}
key: ${{ runner.os }}-pip_manylinux-${{ matrix.image }}-${{ matrix.python-version }}
restore-keys: |
${{ runner.os }}-pip-
${{ runner.os }}-${{ runner.arch }}-pip-

- name: pip cache (Windows)
uses: actions/cache@v4
uses: actions/cache@v5
if: ${{ startsWith(runner.os, 'Windows') }}
with:
path: ${{ steps.pip-cache-windows.outputs.dir }}
key: ${{ runner.os }}-pip_manylinux-${{ matrix.image }}-${{ matrix.python-version }}
restore-keys: |
${{ runner.os }}-pip-
${{ runner.os }}-${{ runner.arch }}-pip-

- name: Update pip
run: pip install -U pip
Expand All @@ -588,7 +623,7 @@ jobs:
bash .manylinux.sh

- name: Upload zope.proxy wheels
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
path: wheelhouse/*whl
name: manylinux_${{ matrix.image }}_wheels.zip
Expand All @@ -615,7 +650,7 @@ jobs:

steps:
- name: Download all wheel artifacts
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
path: dist/
pattern: '*'
Expand All @@ -632,7 +667,7 @@ jobs:
# PyPy wheels shouldn't be uploaded, remove them if present
find dist/ -name "*pypy*" -type f -delete || true
find dist/ -name "*none-any*" -type f -delete || true
# Wheels for the no-yet-supported future Python version need to go
# Wheels for the not-yet-supported future Python version need to go
find dist/ -name "*3.15*" -type f -delete || true
find dist/ -name "*cp315*" -type f -delete || true
# For Linux, we only want the manylinux wheels
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@ lib64
log/
parts/
pyvenv.cfg
share/
testing.log
var/
3 changes: 2 additions & 1 deletion .meta.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# https://github.com/zopefoundation/meta/tree/master/src/zope/meta/c-code
[meta]
template = "c-code"
commit-id = "f62d8bab"
commit-id = "f472bcc5"

[python]
with-windows = true
Expand All @@ -11,6 +11,7 @@ with-future-python = true
with-docs = true
with-sphinx-doctests = true
with-macos = false
with-free-threaded-python = false

[tox]
use-flake8 = true
Expand Down
5 changes: 3 additions & 2 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
minimum_pre_commit_version: '3.6'
repos:
- repo: https://github.com/pycqa/isort
rev: "7.0.0"
rev: "8.0.1"
hooks:
- id: isort
- repo: https://github.com/hhatto/autopep8
Expand All @@ -12,7 +12,7 @@ repos:
- id: autopep8
args: [--in-place, --aggressive, --aggressive]
- repo: https://github.com/asottile/pyupgrade
rev: v3.21.0
rev: v3.21.2
hooks:
- id: pyupgrade
args: [--py310-plus]
Expand All @@ -21,6 +21,7 @@ repos:
rev: 0.4.3
hooks:
- id: teyit
language_version: python3.13
- repo: https://github.com/PyCQA/flake8
rev: "7.3.0"
hooks:
Expand Down
4 changes: 3 additions & 1 deletion CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ Change log
7.2 (unreleased)
----------------

- Nothing changed yet.
- Add support for automatically building and publishing Windows/ARM64 wheels.

- Add support for automatically building and publishing source distributions.


7.1 (2025-11-18)
Expand Down
Loading
Loading