Skip to content

Commit a969cd9

Browse files
minrkminrk
committed
Merge branch 'main' into limited-api
2 parents 55be942 + 2c768db commit a969cd9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+835
-866
lines changed

‎.circleci/config.yml

-62
This file was deleted.

‎.github/dependabot.yml

+4
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,7 @@ updates:
66
directory: "/"
77
schedule:
88
interval: monthly
9+
- package-ecosystem: pip
10+
directory: "/tools"
11+
schedule:
12+
interval: weekly

‎.github/workflows/test-docs.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ env:
2626

2727
jobs:
2828
test-docs:
29-
runs-on: ubuntu-22.04
29+
runs-on: ubuntu-24.04
3030
steps:
3131
- uses: actions/checkout@v4
3232

3333
- uses: actions/setup-python@v5
3434
with:
35-
python-version: "3.11"
35+
python-version: "3.12"
3636
cache: pip
3737

3838
- name: Install libzmq

‎.github/workflows/test.yml

+20-13
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ jobs:
3535
continue-on-error: ${{ matrix.zmq == 'head' }}
3636

3737
env:
38-
MACOSX_DEPLOYMENT_TARGET: "11.7"
38+
MACOSX_DEPLOYMENT_TARGET: "13.7"
3939

4040
strategy:
4141
fail-fast: true
4242
matrix:
4343
include:
4444
- os: macos-13
45-
python: "3.7"
45+
python: "3.8"
4646

4747
- os: macos-14
4848
python: "3.12"
@@ -56,8 +56,8 @@ jobs:
5656
python: pypy-3.9
5757
zmq: bundled
5858

59-
- os: ubuntu-20.04
60-
python: "3.7"
59+
- os: ubuntu-22.04
60+
python: "3.8"
6161
zmq: bundled
6262
tornado: none
6363

@@ -66,7 +66,7 @@ jobs:
6666
zmq: bundled
6767

6868
- os: ubuntu-22.04
69-
python: pypy-3.7
69+
python: pypy-3.8
7070

7171
- os: ubuntu-22.04
7272
python: "3.9"
@@ -77,27 +77,28 @@ jobs:
7777

7878
- os: ubuntu-22.04
7979
python: "3.11"
80-
81-
- os: ubuntu-22.04
82-
python: "3.8"
8380
zmq: head
8481

85-
- os: ubuntu-22.04
82+
- os: ubuntu-24.04
8683
python: "3.12"
8784

88-
- os: ubuntu-22.04
85+
- os: ubuntu-24.04
8986
python: "3.13"
87+
backend: cffi
9088

91-
- os: ubuntu-22.04
89+
- os: ubuntu-24.04
90+
python: "3.13"
91+
92+
- os: ubuntu-24.04
9293
python: "3.13"
9394
free_threading: free_threading
9495

9596
- os: windows-2022
96-
python: "3.7"
97+
python: "3.8"
9798
arch: x86
9899

99100
- os: windows-2022
100-
python: "3.9"
101+
python: "3.11"
101102
arch: x64
102103

103104
- os: windows-2022
@@ -196,6 +197,12 @@ jobs:
196197
run: |
197198
echo "ZMQ_PREFIX=${{ matrix.zmq }}" >> "$GITHUB_ENV"
198199
200+
- name: set $PYZMQ_BACKEND
201+
if: matrix.backend
202+
run: |
203+
echo "PYZMQ_BACKEND=${{ matrix.backend }}" >> "$GITHUB_ENV"
204+
pip install cffi
205+
199206
- name: install libzmq-dev
200207
if: matrix.zmq == 'head'
201208
run: |

‎.github/workflows/wheels.yml

+17-48
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
name: wheel-${{ matrix.name }}
6363

6464
env:
65-
MACOSX_DEPLOYMENT_TARGET: "10.9"
65+
MACOSX_DEPLOYMENT_TARGET: "10.15"
6666
CIBW_BUILD: "${{ matrix.cibw.build || '*' }}"
6767
CIBW_SKIP: "${{ matrix.cibw.skip || '' }}"
6868
CIBW_ARCHS: "${{ matrix.cibw.arch || 'auto' }}"
@@ -72,18 +72,13 @@ jobs:
7272
fail-fast: false
7373
matrix:
7474
include:
75-
- os: macos-13
76-
name: mac-cpython
77-
cibw:
78-
build: "cp*"
79-
8075
- os: macos-13
8176
name: mac-pypy
8277
cibw:
8378
build: "pp*"
8479

8580
- os: macos-14
86-
name: mac-arm
81+
name: mac-cpython
8782
cibw:
8883
arch: universal2
8984
build: "cp*"
@@ -98,6 +93,11 @@ jobs:
9893
arch: i686
9994
build: "*manylinux*"
10095

96+
- name: manylinux-arm
97+
os: ubuntu-24.04-arm
98+
cibw:
99+
build: "*manylinux*"
100+
101101
# additional manylinux variants, not specified in pyproject.toml:
102102
# build with newer 2_28 for cpython >= 3.10, pypy 3.9
103103
- name: manylinux-x86_64-2_28
@@ -110,13 +110,16 @@ jobs:
110110
cibw:
111111
build: "*musllinux*"
112112

113+
- name: musllinux-arm
114+
os: ubuntu-24.04-arm
115+
cibw:
116+
build: "*musllinux*"
117+
113118
- name: win32
114119
os: windows-2019
115120
architecture: x86
116121
cibw:
117122
build: "cp*win32"
118-
# free-threaded doesn't seem to work on Windows
119-
skip: "*t-win*"
120123

121124
- os: windows-2019
122125
name: win-pypy
@@ -129,16 +132,13 @@ jobs:
129132
architecture: x64
130133
cibw:
131134
build: "cp*win_amd64"
132-
# free-threaded doesn't seem to work on Windows
133-
skip: "*t-win*"
134135

135136
- os: windows-2022
136137
name: win_arm64
137138
architecture: x64
138139
cibw:
139140
arch: ARM64
140-
# free-threaded doesn't seem to work on Windows
141-
skip: "cp37* *t-win*"
141+
skip: "cp37*"
142142

143143
steps:
144144
- uses: actions/checkout@v4
@@ -182,38 +182,6 @@ jobs:
182182
path: "wheelhouse/*"
183183
if-no-files-found: error
184184

185-
circle-wheels:
186-
if: github.repository_owner == 'zeromq'
187-
runs-on: ubuntu-22.04
188-
needs:
189-
# not strictly required, but avoids wasting cpu time waiting
190-
- wheel
191-
steps:
192-
- uses: actions/checkout@v4
193-
194-
- name: setup python
195-
uses: actions/setup-python@v5
196-
with:
197-
python-version: "3.11"
198-
cache: pip
199-
200-
- name: install dependencies
201-
run: |
202-
pip install --upgrade setuptools pip wheel
203-
pip install requests
204-
205-
- name: fetch wheels from circleci
206-
run: python3 tools/circle_wheels.py
207-
env:
208-
CIRCLECI_TOKEN: ${{ secrets.CIRCLECI_TOKEN }}
209-
PR_HEAD_SHA: ${{ github.event.pull_request && github.event.pull_request.head.sha }}
210-
211-
- uses: actions/upload-artifact@v4
212-
with:
213-
name: wheels-linux-arm
214-
path: "wheelhouse/*"
215-
if-no-files-found: error
216-
217185
github-release:
218186
permissions:
219187
contents: write
@@ -249,14 +217,16 @@ jobs:
249217
needs:
250218
- sdist
251219
- wheel
252-
- circle-wheels
253220
steps:
221+
- uses: actions/checkout@v4
254222
- uses: actions/download-artifact@v4
255223
with:
256224
path: dist
257225
merge-multiple: true
258226
- name: list wheels
259-
run: ls -l dist
227+
run: |
228+
ls -l dist
229+
python3 tools/wheel_summary.py dist | tee "$GITHUB_STEP_SUMMARY"
260230
261231
upload-pypi:
262232
permissions:
@@ -267,7 +237,6 @@ jobs:
267237
needs:
268238
- sdist
269239
- wheel
270-
- circle-wheels
271240
steps:
272241
- uses: actions/download-artifact@v4
273242
with:

‎.pre-commit-config.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ repos:
1515
additional_dependencies:
1616
- ruff
1717
- repo: https://github.com/executablebooks/mdformat
18-
rev: 0.7.18 # Use the ref you want to point at
18+
rev: 0.7.22 # Use the ref you want to point at
1919
hooks:
2020
- id: mdformat
2121
# Optionally add plugins
@@ -26,7 +26,7 @@ repos:
2626

2727
# autoformat and lint Python code
2828
- repo: https://github.com/astral-sh/ruff-pre-commit
29-
rev: v0.7.2
29+
rev: v0.9.9
3030
hooks:
3131
- id: ruff
3232
types_or:
@@ -43,7 +43,7 @@ repos:
4343
exclude: zmq/constants.py
4444

4545
- repo: https://github.com/pre-commit/mirrors-mypy
46-
rev: v1.13.0
46+
rev: v1.15.0
4747
hooks:
4848
- id: mypy
4949
files: zmq/.*

0 commit comments

Comments
 (0)