Skip to content

Commit c0236cd

Browse files
committed
Build and test CPython 3.15 - bump Cython
Builds a wheel for CPython 3.15 now that rc1 is out. Wheels are produced for macOS and Windows, Linux is still sdist only. Bumps the Cython build version to 3.3.0 that incorporates various bugfixes and CPython 3.15 compatibility. Also bumps the various GitHub Actions versions to the latest available. Signed-off-by: Jordan Borean <jborean93@gmail.com>
1 parent 5acb5b1 commit c0236cd

5 files changed

Lines changed: 53 additions & 33 deletions

File tree

.github/workflows/ci.yml

Lines changed: 47 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Check out code
14-
uses: actions/checkout@v6
14+
uses: actions/checkout@v7
1515

1616
- name: Select python
17-
uses: actions/setup-python@v6
17+
uses: actions/setup-python@v7
1818
with:
1919
python-version: 3.12
2020

@@ -28,7 +28,7 @@ jobs:
2828
GSSAPI_COMPILER_ARGS: ''
2929

3030
- name: Upload sdist
31-
uses: actions/upload-artifact@v6
31+
uses: actions/upload-artifact@v7
3232
with:
3333
name: artifact-sdist
3434
path: ./dist/*.tar.gz
@@ -45,6 +45,10 @@ jobs:
4545
include:
4646
# Free-threading does not support Limited API/Stable ABI yet
4747
# 3.11+ can use the Limited API/Stable ABI
48+
- os: macos-15-intel
49+
version: cp315t-macosx_x86_64
50+
- os: macos-15
51+
version: cp315t-macosx_arm64
4852
- os: macos-15-intel
4953
version: cp314t-macosx_x86_64
5054
- os: macos-15
@@ -63,6 +67,10 @@ jobs:
6367
- os: macos-15
6468
version: cp39-macosx_arm64
6569

70+
- os: windows-2022
71+
version: cp315t-win_amd64
72+
- os: windows-2022
73+
version: cp315t-win32
6674
- os: windows-2022
6775
version: cp314t-win_amd64
6876
- os: windows-2022
@@ -84,20 +92,25 @@ jobs:
8492
steps:
8593
- name: Set up environment
8694
if: startsWith(matrix.os, 'windows-')
87-
shell: bash
95+
shell: pwsh
8896
run: |
89-
choco.exe install \
90-
--no-progress \
91-
--yes \
92-
--ignore-detected-reboot \
93-
--allow-downgrade \
94-
--install-arguments "'ADDLOCAL=ALL'" \
95-
${{ endsWith(matrix.version, '-win32') && '--x86' || '' }} mitkerberos || true
96-
97-
echo "C:\Program Files${{ endsWith(matrix.version, '-win32') && ' (x86)' || '' }}\MIT\Kerberos\bin;$PATH" >> $GITHUB_PATH
97+
$arch = '${{ endsWith(matrix.version, '-win32') && '--x86' || '' }}'
98+
$chocoArgs = @(
99+
'mitkerberos',
100+
'--no-progress',
101+
'--yes',
102+
'--ignore-detected-reboot',
103+
'--allow-downgrade',
104+
'--install-arguments', 'ADDLOCAL=ALL'
105+
if ($arch) { $arch }
106+
)
107+
choco.exe install @chocoArgs
108+
109+
'C:\Program Files${{ endsWith(matrix.version, '-win32') && ' (x86)' || '' }}\MIT\Kerberos\bin' |
110+
Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
98111
99112
- name: Download gssapi sdist
100-
uses: actions/download-artifact@v6
113+
uses: actions/download-artifact@v8
101114
with:
102115
name: artifact-sdist
103116
path: ./
@@ -111,14 +124,14 @@ jobs:
111124
rm gssapi-*.tar.gz
112125
113126
- name: Build wheel
114-
uses: pypa/cibuildwheel@v3.2.1
127+
uses: pypa/cibuildwheel@v4.2.0
115128
env:
116129
CIBW_BUILD: ${{ matrix.version }}
117130
CIBW_BUILD_VERBOSITY: 1
118131
CIBW_PRERELEASE_PYTHONS: ${{ matrix.prerelease || 'false' }}
119132

120133
- name: Upload wheel
121-
uses: actions/upload-artifact@v6
134+
uses: actions/upload-artifact@v7
122135
with:
123136
path: ./wheelhouse/*.whl
124137
name: artifact-wheel-${{ matrix.version }}
@@ -131,7 +144,7 @@ jobs:
131144
runs-on: ubuntu-latest
132145
steps:
133146
- name: Download gssapi sdist
134-
uses: actions/download-artifact@v6
147+
uses: actions/download-artifact@v8
135148
with:
136149
name: artifact-sdist
137150
path: ./dist
@@ -188,10 +201,10 @@ jobs:
188201

189202
steps:
190203
- name: Check out code
191-
uses: actions/checkout@v6
204+
uses: actions/checkout@v7
192205

193206
- name: Download built project
194-
uses: actions/download-artifact@v6
207+
uses: actions/download-artifact@v8
195208
with:
196209
pattern: artifact-*
197210
merge-multiple: true
@@ -214,6 +227,8 @@ jobs:
214227
fail-fast: false
215228
matrix:
216229
name:
230+
- win-py-3.15t
231+
- win-py-3.15
217232
- win-py-3.14t
218233
- win-py-3.14
219234
- win-py-3.13
@@ -225,6 +240,10 @@ jobs:
225240
- x64
226241
- x86
227242
include:
243+
- name: win-py-3.15t
244+
pyenv: '3.15t-rc.1'
245+
- name: win-py-3.15
246+
pyenv: '3.15-rc.1'
228247
- name: win-py-3.14t
229248
pyenv: '3.14t'
230249
- name: win-py-3.14
@@ -242,17 +261,17 @@ jobs:
242261

243262
steps:
244263
- name: Check out code
245-
uses: actions/checkout@v6
264+
uses: actions/checkout@v7
246265

247266
- name: Download built project
248-
uses: actions/download-artifact@v6
267+
uses: actions/download-artifact@v8
249268
with:
250269
pattern: artifact-*
251270
merge-multiple: true
252271
path: ./dist
253272

254273
- name: Install the right python
255-
uses: actions/setup-python@v6
274+
uses: actions/setup-python@v7
256275
with:
257276
python-version: ${{ matrix.pyenv }}
258277
architecture: ${{ matrix.arch }}
@@ -271,10 +290,10 @@ jobs:
271290
runs-on: macos-latest
272291
steps:
273292
- name: Check out code
274-
uses: actions/checkout@v6
293+
uses: actions/checkout@v7
275294

276295
- name: Download built project
277-
uses: actions/download-artifact@v6
296+
uses: actions/download-artifact@v8
278297
with:
279298
pattern: artifact-*
280299
merge-multiple: true
@@ -303,10 +322,10 @@ jobs:
303322

304323
steps:
305324
- name: Check out code
306-
uses: actions/checkout@v6
325+
uses: actions/checkout@v7
307326

308327
- name: Download built project
309-
uses: actions/download-artifact@v6
328+
uses: actions/download-artifact@v8
310329
with:
311330
pattern: artifact-*
312331
merge-multiple: true
@@ -326,7 +345,7 @@ jobs:
326345
run: echo "checksum=`ls tag_build/*.sha512sum | awk -F/ '{print $2}'`" >> $GITHUB_OUTPUT
327346

328347
- name: Upload tagged build artifact
329-
uses: actions/upload-artifact@v6
348+
uses: actions/upload-artifact@v7
330349
with:
331350
path: tag_build/${{ steps.tarball.outputs.tarball }}
332351
name: release-asset
@@ -341,7 +360,7 @@ jobs:
341360

342361
- name: Create release with tar artifact
343362
if: startsWith(github.ref, 'refs/tags/v')
344-
uses: softprops/action-gh-release@v2
363+
uses: softprops/action-gh-release@v3
345364
with:
346365
files: |
347366
tag_build/${{ steps.tarball.outputs.tarball }}

.github/workflows/deploy-docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: Check out code
11-
uses: actions/checkout@v6
11+
uses: actions/checkout@v7
1212

1313
- name: Select python
14-
uses: actions/setup-python@v6
14+
uses: actions/setup-python@v7
1515
with:
1616
python-version: 3.12
1717

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212

1313
steps:
14-
- uses: actions/stale@v10.1.1
14+
- uses: actions/stale@v11.0.0
1515
id: stale
1616
with:
1717
days-before-stale: -1

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[build-system]
22
requires = [
3-
"Cython == 3.2.4",
3+
"Cython == 3.3.0",
44
"setuptools >= 40.6.0", # Start of PEP 517 support for setuptools
55
]
66
build-backend = "setuptools.build_meta"

setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ def gssapi_modules(lst):
310310

311311
setup(
312312
name='gssapi',
313-
version='1.11.1',
313+
version='1.12.0',
314314
author='The Python GSSAPI Team',
315315
author_email='jborean93@gmail.com',
316316
packages=['gssapi', 'gssapi.raw', 'gssapi.raw._enum_extensions',
@@ -336,6 +336,7 @@ def gssapi_modules(lst):
336336
'Programming Language :: Python :: 3.12',
337337
'Programming Language :: Python :: 3.13',
338338
'Programming Language :: Python :: 3.14',
339+
'Programming Language :: Python :: 3.15',
339340
"Programming Language :: Python :: Free Threading :: 2 - Beta",
340341
'Intended Audience :: Developers',
341342
'Programming Language :: Python :: Implementation :: CPython',

0 commit comments

Comments
 (0)