@@ -42,92 +42,92 @@ jobs:
4242 matrix :
4343 include :
4444 # Windows 32 bit
45- # - os: windows-latest
46- # python: 39
47- # platform_id: win32
48- # - os: windows-latest
49- # python: 310
50- # platform_id: win32
51- # - os: windows-latest
52- # python: 311
53- # platform_id: win32
54- # - os: windows-latest
55- # python: 312
56- # platform_id: win32
57- # - os: windows-latest
58- # python: 313
59- # platform_id: win32
60- #
61- # # Windows 64 bit
62- # - os: windows-latest
63- # python: 39
64- # platform_id: win_amd64
65- # - os: windows-latest
66- # python: 310
67- # platform_id: win_amd64
68- # - os: windows-latest
69- # python: 311
70- # platform_id: win_amd64
71- # - os: windows-latest
72- # python: 312
73- # platform_id: win_amd64
74- # - os: windows-latest
75- # python: 313
76- # platform_id: win_amd64
77- #
78- # # Linux 64 bit manylinux2014
79- # - os: ubuntu-latest
80- # python: 39
81- # platform_id: manylinux_x86_64
82- # manylinux_image: manylinux2014
83- # - os: ubuntu-latest
84- # python: 310
85- # platform_id: manylinux_x86_64
86- # manylinux_image: manylinux2014
87- # - os: ubuntu-latest
88- # python: 311
89- # platform_id: manylinux_x86_64
90- # manylinux_image: manylinux2014
91- # - os: ubuntu-latest
92- # python: 312
93- # platform_id: manylinux_x86_64
94- # manylinux_image: manylinux2014
95- # - os: ubuntu-latest
96- # python: 313
97- # platform_id: manylinux_x86_64
98- # manylinux_image: manylinux2014
99- #
100- # # Linux aarch64
101- # - os: ubuntu-latest
102- # python: 39
103- # platform_id: manylinux_aarch64
104- # - os: ubuntu-latest
105- # python: 310
106- # platform_id: manylinux_aarch64
107- # - os: ubuntu-latest
108- # python: 311
109- # platform_id: manylinux_aarch64
110- # - os: ubuntu-latest
111- # python: 312
112- # platform_id: manylinux_aarch64
113- # - os: ubuntu-latest
114- # python: 313
115- # platform_id: manylinux_aarch64
45+ - os : windows-latest
46+ python : 39
47+ platform_id : win32
48+ - os : windows-latest
49+ python : 310
50+ platform_id : win32
51+ - os : windows-latest
52+ python : 311
53+ platform_id : win32
54+ - os : windows-latest
55+ python : 312
56+ platform_id : win32
57+ - os : windows-latest
58+ python : 313
59+ platform_id : win32
60+
61+ # Windows 64 bit
62+ - os : windows-latest
63+ python : 39
64+ platform_id : win_amd64
65+ - os : windows-latest
66+ python : 310
67+ platform_id : win_amd64
68+ - os : windows-latest
69+ python : 311
70+ platform_id : win_amd64
71+ - os : windows-latest
72+ python : 312
73+ platform_id : win_amd64
74+ - os : windows-latest
75+ python : 313
76+ platform_id : win_amd64
77+
78+ # Linux 64 bit manylinux2014
79+ - os : ubuntu-latest
80+ python : 39
81+ platform_id : manylinux_x86_64
82+ manylinux_image : manylinux2014
83+ - os : ubuntu-latest
84+ python : 310
85+ platform_id : manylinux_x86_64
86+ manylinux_image : manylinux2014
87+ - os : ubuntu-latest
88+ python : 311
89+ platform_id : manylinux_x86_64
90+ manylinux_image : manylinux2014
91+ - os : ubuntu-latest
92+ python : 312
93+ platform_id : manylinux_x86_64
94+ manylinux_image : manylinux2014
95+ - os : ubuntu-latest
96+ python : 313
97+ platform_id : manylinux_x86_64
98+ manylinux_image : manylinux2014
11699
117- # MacOS 12 x86_64
118- - os : macos-12
100+ # Linux aarch64
101+ - os : ubuntu-latest
102+ python : 39
103+ platform_id : manylinux_aarch64
104+ - os : ubuntu-latest
105+ python : 310
106+ platform_id : manylinux_aarch64
107+ - os : ubuntu-latest
108+ python : 311
109+ platform_id : manylinux_aarch64
110+ - os : ubuntu-latest
111+ python : 312
112+ platform_id : manylinux_aarch64
113+ - os : ubuntu-latest
114+ python : 313
115+ platform_id : manylinux_aarch64
116+
117+ # MacOS 13 x86_64
118+ - os : macos-13
119119 python : 39
120120 platform_id : macosx_x86_64
121- - os : macos-12
121+ - os : macos-13
122122 python : 310
123123 platform_id : macosx_x86_64
124- - os : macos-12
124+ - os : macos-13
125125 python : 311
126126 platform_id : macosx_x86_64
127- - os : macos-12
127+ - os : macos-13
128128 python : 312
129129 platform_id : macosx_x86_64
130- - os : macos-12
130+ - os : macos-13
131131 python : 313
132132 platform_id : macosx_x86_64
133133
@@ -171,56 +171,56 @@ jobs:
171171 name : wheel-${{ matrix.python }}-${{ matrix.platform_id }}
172172 path : ./dist
173173
174- # build-wheels-macos-arm64:
175- # name: Build wheel for cp${{ matrix.python }}-${{ matrix.platform_id }}
176- # runs-on: ${{ matrix.os }}
177- # strategy:
178- # fail-fast: false
179- # matrix:
180- # include:
181- # # MacOS 14 arm64
182- # - os: macos-14
183- # python: 39
184- # platform_id: macosx_arm64
185- # - os: macos-14
186- # python: 310
187- # platform_id: macosx_arm64
188- # - os: macos-14
189- # python: 311
190- # platform_id: macosx_arm64
191- # - os: macos-14
192- # python: 312
193- # platform_id: macosx_arm64
194- # - os: macos-14
195- # python: 313
196- # platform_id: macosx_arm64
197- #
198- # steps:
199- # - uses: actions/checkout@v4
200- # with:
201- # submodules: true
202- #
203- # - uses: actions/setup-python@v5
204- # name: Install Python
205- # with:
206- # python-version: '3.9'
207- #
208- # - name: Install cibuildwheel
209- # run: python -m pip install cibuildwheel>=2.21 wheel>=0.42
210- #
211- # - name: Build wheels
212- # env:
213- # CIBW_BUILD: cp${{ matrix.python }}-*
214- # CIBW_ARCHS_MACOS: arm64
215- # CIBW_BUILD_VERBOSITY: 1
216- # run: |
217- # python -m cibuildwheel --output-dir dist
218- #
219- # - name: Store artifacts
220- # uses: actions/upload-artifact@v4
221- # with:
222- # name: wheel-${{ matrix.python }}-${{ matrix.platform_id }}
223- # path: ./dist/*.whl
174+ build-wheels-macos-arm64 :
175+ name : Build wheel for cp${{ matrix.python }}-${{ matrix.platform_id }}
176+ runs-on : ${{ matrix.os }}
177+ strategy :
178+ fail-fast : false
179+ matrix :
180+ include :
181+ # MacOS 14 arm64
182+ - os : macos-14
183+ python : 39
184+ platform_id : macosx_arm64
185+ - os : macos-14
186+ python : 310
187+ platform_id : macosx_arm64
188+ - os : macos-14
189+ python : 311
190+ platform_id : macosx_arm64
191+ - os : macos-14
192+ python : 312
193+ platform_id : macosx_arm64
194+ - os : macos-14
195+ python : 313
196+ platform_id : macosx_arm64
197+
198+ steps :
199+ - uses : actions/checkout@v4
200+ with :
201+ submodules : true
202+
203+ - uses : actions/setup-python@v5
204+ name : Install Python
205+ with :
206+ python-version : ' 3.9'
207+
208+ - name : Install cibuildwheel
209+ run : python -m pip install cibuildwheel>=2.21 wheel>=0.42
210+
211+ - name : Build wheels
212+ env :
213+ CIBW_BUILD : cp${{ matrix.python }}-*
214+ CIBW_ARCHS_MACOS : arm64
215+ CIBW_BUILD_VERBOSITY : 1
216+ run : |
217+ python -m cibuildwheel --output-dir dist
218+
219+ - name : Store artifacts
220+ uses : actions/upload-artifact@v4
221+ with :
222+ name : wheel-${{ matrix.python }}-${{ matrix.platform_id }}
223+ path : ./dist/*.whl
224224
225225 # test-package:
226226 # name: Test built package
@@ -271,23 +271,23 @@ jobs:
271271 # The pypi upload fails with non-linux containers, so grab the uploaded
272272 # artifacts and run using those
273273 # See: https://github.com/pypa/gh-action-pypi-publish/discussions/15
274- # deploy:
275- # name: Upload wheels to PyPI
276- # # needs: [ test-package ]
277- # needs: [ build-wheels, build-sdist, build-wheels-macos-arm64 ]
278- # runs-on: ubuntu-latest
279- # environment:
280- # name: pypi
281- # url: https://pypi.org/project/pylibjpeg-openjpeg/
282- # permissions:
283- # id-token: write
284- #
285- # steps:
286- # - name: Download the wheels
287- # uses: actions/download-artifact@v4
288- # with:
289- # path: dist/
290- # merge-multiple: true
291- #
292- # - name: Publish package to PyPi
293- # uses: pypa/gh-action-pypi-publish@release/v1
274+ deploy :
275+ name : Upload wheels to PyPI
276+ # needs: [ test-package ]
277+ needs : [ build-wheels, build-sdist, build-wheels-macos-arm64 ]
278+ runs-on : ubuntu-latest
279+ environment :
280+ name : pypi
281+ url : https://pypi.org/project/pylibjpeg-openjpeg/
282+ permissions :
283+ id-token : write
284+
285+ steps :
286+ - name : Download the wheels
287+ uses : actions/download-artifact@v4
288+ with :
289+ path : dist/
290+ merge-multiple : true
291+
292+ - name : Publish package to PyPi
293+ uses : pypa/gh-action-pypi-publish@release/v1
0 commit comments