Skip to content

Commit 39539ba

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 39539ba

5 files changed

Lines changed: 54 additions & 33 deletions

File tree

.github/workflows/ci.yml

Lines changed: 48 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,26 @@ 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
111+
exit 0
98112
99113
- name: Download gssapi sdist
100-
uses: actions/download-artifact@v6
114+
uses: actions/download-artifact@v8
101115
with:
102116
name: artifact-sdist
103117
path: ./
@@ -111,14 +125,14 @@ jobs:
111125
rm gssapi-*.tar.gz
112126
113127
- name: Build wheel
114-
uses: pypa/cibuildwheel@v3.2.1
128+
uses: pypa/cibuildwheel@v4.2.0
115129
env:
116130
CIBW_BUILD: ${{ matrix.version }}
117131
CIBW_BUILD_VERBOSITY: 1
118132
CIBW_PRERELEASE_PYTHONS: ${{ matrix.prerelease || 'false' }}
119133

120134
- name: Upload wheel
121-
uses: actions/upload-artifact@v6
135+
uses: actions/upload-artifact@v7
122136
with:
123137
path: ./wheelhouse/*.whl
124138
name: artifact-wheel-${{ matrix.version }}
@@ -131,7 +145,7 @@ jobs:
131145
runs-on: ubuntu-latest
132146
steps:
133147
- name: Download gssapi sdist
134-
uses: actions/download-artifact@v6
148+
uses: actions/download-artifact@v8
135149
with:
136150
name: artifact-sdist
137151
path: ./dist
@@ -188,10 +202,10 @@ jobs:
188202

189203
steps:
190204
- name: Check out code
191-
uses: actions/checkout@v6
205+
uses: actions/checkout@v7
192206

193207
- name: Download built project
194-
uses: actions/download-artifact@v6
208+
uses: actions/download-artifact@v8
195209
with:
196210
pattern: artifact-*
197211
merge-multiple: true
@@ -214,6 +228,8 @@ jobs:
214228
fail-fast: false
215229
matrix:
216230
name:
231+
- win-py-3.15t
232+
- win-py-3.15
217233
- win-py-3.14t
218234
- win-py-3.14
219235
- win-py-3.13
@@ -225,6 +241,10 @@ jobs:
225241
- x64
226242
- x86
227243
include:
244+
- name: win-py-3.15t
245+
pyenv: '3.15t-rc.1'
246+
- name: win-py-3.15
247+
pyenv: '3.15-rc.1'
228248
- name: win-py-3.14t
229249
pyenv: '3.14t'
230250
- name: win-py-3.14
@@ -242,17 +262,17 @@ jobs:
242262

243263
steps:
244264
- name: Check out code
245-
uses: actions/checkout@v6
265+
uses: actions/checkout@v7
246266

247267
- name: Download built project
248-
uses: actions/download-artifact@v6
268+
uses: actions/download-artifact@v8
249269
with:
250270
pattern: artifact-*
251271
merge-multiple: true
252272
path: ./dist
253273

254274
- name: Install the right python
255-
uses: actions/setup-python@v6
275+
uses: actions/setup-python@v7
256276
with:
257277
python-version: ${{ matrix.pyenv }}
258278
architecture: ${{ matrix.arch }}
@@ -271,10 +291,10 @@ jobs:
271291
runs-on: macos-latest
272292
steps:
273293
- name: Check out code
274-
uses: actions/checkout@v6
294+
uses: actions/checkout@v7
275295

276296
- name: Download built project
277-
uses: actions/download-artifact@v6
297+
uses: actions/download-artifact@v8
278298
with:
279299
pattern: artifact-*
280300
merge-multiple: true
@@ -303,10 +323,10 @@ jobs:
303323

304324
steps:
305325
- name: Check out code
306-
uses: actions/checkout@v6
326+
uses: actions/checkout@v7
307327

308328
- name: Download built project
309-
uses: actions/download-artifact@v6
329+
uses: actions/download-artifact@v8
310330
with:
311331
pattern: artifact-*
312332
merge-multiple: true
@@ -326,7 +346,7 @@ jobs:
326346
run: echo "checksum=`ls tag_build/*.sha512sum | awk -F/ '{print $2}'`" >> $GITHUB_OUTPUT
327347

328348
- name: Upload tagged build artifact
329-
uses: actions/upload-artifact@v6
349+
uses: actions/upload-artifact@v7
330350
with:
331351
path: tag_build/${{ steps.tarball.outputs.tarball }}
332352
name: release-asset
@@ -341,7 +361,7 @@ jobs:
341361

342362
- name: Create release with tar artifact
343363
if: startsWith(github.ref, 'refs/tags/v')
344-
uses: softprops/action-gh-release@v2
364+
uses: softprops/action-gh-release@v3
345365
with:
346366
files: |
347367
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)