Skip to content

Commit 973af21

Browse files
biojppmbiojppm
authored
Merge pull request #514 from biojppm/fix/513-readme_python_example
2 parents 009242d + 8c82a2e commit 973af21

7 files changed

Lines changed: 262 additions & 293 deletions

File tree

‎.github/workflows-in/Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
SHELL := bash
22

33
YS_VERSION := 0.1.88
4-
YS_PREFIX := /tmp/rapidyaml
4+
YS_PREFIX := $(shell cd ../.. ; pwd)/build/ys
55
YS := $(YS_PREFIX)/bin/ys-$(YS_VERSION)
66

77
INPUT_FILES := $(wildcard */*)
@@ -55,6 +55,7 @@ force:
5555
# Auto install a specific version of ys
5656
install-ys: $(YS)
5757
$(YS):
58+
mkdir -p $(YS_PREFIX)
5859
curl -s https://yamlscript.org/install | \
5960
BIN=1 VERSION=$(YS_VERSION) PREFIX=$(YS_PREFIX) bash
6061

‎.github/workflows-in/release.ys‎

Lines changed: 57 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -156,104 +156,68 @@ jobs:
156156
matrix:
157157
# Local function to expand python entries:
158158
python =:
159-
fn(a0 a1 a2 a3 os)::
160-
pythonv:: a0
161-
cibw_pyv:: a1
162-
cibw_arch:: a2
163-
cibw_platform:: a3
164-
name:: "python/$a0/linux/$a2"
165-
sfx:: "python$a0_linux$a2" # suffix
166-
osname: linux
159+
fn(pyv cibwpyv cibwarch cibwplatform os cmkflags):: # NOTE: cannot use _ in names?
160+
name:: "python/$pyv/$cibwplatform"
161+
sfx:: "python$pyv-$cibwplatform" # suffix
167162
os:: os
163+
pythonv:: pyv
164+
cibw_pyv:: cibwpyv
165+
cibw_arch:: cibwarch
166+
cibw_platform:: cibwplatform
167+
cmakeflags:: cmkflags
168168
config:
169-
#- ! python('3.13' 313 'x86_64' 'manylinux_x86_64' 'ubuntu-24.04')
170-
#- ! python('3.13' 313 'i686' 'manylinux_i686' 'ubuntu-24.04')
171-
- ! python('3.12' 312 'x86_64' 'manylinux_x86_64' 'ubuntu-24.04')
172-
- ! python('3.12' 312 'i686' 'manylinux_i686' 'ubuntu-24.04')
173-
- ! python('3.11' 311 'x86_64' 'manylinux_x86_64' 'ubuntu-24.04')
174-
- ! python('3.11' 311 'i686' 'manylinux_i686' 'ubuntu-24.04')
175-
- ! python('3.10' 310 'x86_64' 'manylinux_x86_64' 'ubuntu-24.04')
176-
- ! python('3.10' 310 'i686' 'manylinux_i686' 'ubuntu-24.04')
177-
- ! python('3.9' 39 'x86_64' 'manylinux_x86_64' 'ubuntu-24.04')
178-
- ! python('3.9' 39 'i686' 'manylinux_i686' 'ubuntu-24.04')
179-
- ! python('3.8' 38 'x86_64' 'manylinux_x86_64' 'ubuntu-24.04')
180-
- ! python('3.8' 38 'i686' 'manylinux_i686' 'ubuntu-24.04')
181-
- ! python('3.7' 37 'x86_64' 'manylinux_x86_64' 'ubuntu-22.04')
182-
- ! python('3.7' 37 'i686' 'manylinux_i686' 'ubuntu-22.04')
183-
#- ! python('3.6' 36 'x86_64' 'manylinux_x86_64' 'ubuntu-22.04')
184-
#- ! python('3.6' 36 'i686' 'manylinux_i686' 'ubuntu-22.04')
185-
# the windows builds are disabled because they are causing problems and
186-
# preventing the release.
187-
# the problems are related to CMakeExtension forcing the use of Ninja
188-
# which does not play well with the -G 'Visual Studio...' option used
189-
# below.
190-
# fixing this looks like it will be time-intensive.
191-
#- {pythonv: '3.11', cibw_pyv: 311, cibw_arch: AMD64 ,
192-
# cibw_platform: win_amd64, osname: win , os: windows-2019,
193-
# cxx: vs2019},
194-
# cmakeflags: '-G "Visual Studio 16 2019" -A x64'}
195-
#- {pythonv: '3.11', cibw_pyv: 311, cibw_arch: x86 ,
196-
# cibw_platform: win32 , osname: win , os: windows-2019,
197-
# cxx: vs2019},
198-
# cmakeflags: '-G "Visual Studio 16 2019" -A Win32'}
199-
#- {pythonv: '3.10', cibw_pyv: 310, cibw_arch: AMD64 ,
200-
# cibw_platform: win_amd64, osname: win , os: windows-2019,
201-
# cxx: vs2019},
202-
# cmakeflags: '-G "Visual Studio 16 2019" -A x64'}
203-
#- {pythonv: '3.10', cibw_pyv: 310, cibw_arch: x86 ,
204-
# cibw_platform: win32 , osname: win , os: windows-2019,
205-
# cxx: vs2019},
206-
# cmakeflags: '-G "Visual Studio 16 2019" -A Win32'}
207-
#- {pythonv: '3.9' , cibw_pyv: 39 , cibw_arch: AMD64 ,
208-
# cibw_platform: win_amd64, osname: win , os: windows-2019,
209-
# cxx: vs2019},
210-
# cmakeflags: '-G "Visual Studio 16 2019" -A x64'}
211-
#- {pythonv: '3.9' , cibw_pyv: 39 , cibw_arch: x86 ,
212-
# cibw_platform: win32 , osname: win , os: windows-2019,
213-
# cxx: vs2019},
214-
# cmakeflags: '-G "Visual Studio 16 2019" -A Win32'}
215-
#- {pythonv: '3.8' , cibw_pyv: 38 , cibw_arch: AMD64 ,
216-
# cibw_platform: win_amd64, osname: win , os: windows-2019,
217-
# cxx: vs2019},
218-
# cmakeflags: '-G "Visual Studio 16 2019" -A x64'}
219-
#- {pythonv: '3.8' , cibw_pyv: 38 , cibw_arch: x86 ,
220-
# cibw_platform: win32 , osname: win , os: windows-2019,
221-
# cxx: vs2019},
222-
# cmakeflags: '-G "Visual Studio 16 2019" -A Win32'}
223-
#- {pythonv: '3.7' , cibw_pyv: 37 , cibw_arch: AMD64 ,
224-
# cibw_platform: win_amd64, osname: win , os: windows-2019,
225-
# cxx: vs2019},
226-
# cmakeflags: '-G "Visual Studio 16 2019" -A x64'}
227-
#- {pythonv: '3.7' , cibw_pyv: 37 , cibw_arch: x86 ,
228-
# cibw_platform: win32 , osname: win , os: windows-2019,
229-
# cxx: vs2019},
230-
# cmakeflags: '-G "Visual Studio 16 2019" -A Win32'}
231-
#- {pythonv: '3.6' , cibw_pyv: 36 , cibw_arch: AMD64 ,
232-
# cibw_platform: win_amd64, osname: win , os: windows-2019,
233-
# cxx: vs2019},
234-
# cmakeflags: '-G "Visual Studio 16 2019" -A x64'}
235-
#- {pythonv: '3.6' , cibw_pyv: 36 , cibw_arch: x86 ,
236-
# cibw_platform: win32 , osname: win , os: windows-2019,
237-
# cxx: vs2019},
238-
# cmakeflags: '-G "Visual Studio 16 2019" -A Win32'}
239-
## macosx builds are generating a SIGSEGV when importing. (!)
240-
## /biojppm/rapidyaml/actions/runs/3062528713/jobs/4943611397#step:7:269
241-
#- {pythonv: '3.11', cibw_pyv: 311, cibw_arch: x86_64,
242-
# cibw_platform: macosx_x86_64, osname: macos, os: macos-10.15}
243-
#- {pythonv: '3.10', cibw_pyv: 310, cibw_arch: x86_64,
244-
# cibw_platform: macosx_x86_64, osname: macos, os: macos-10.15}
245-
#- {pythonv: '3.9' , cibw_pyv: 39 , cibw_arch: x86_64,
246-
# cibw_platform: macosx_x86_64, osname: macos, os: macos-10.15}
247-
#- {pythonv: '3.8' , cibw_pyv: 38 , cibw_arch: x86_64,
248-
# cibw_platform: macosx_x86_64, osname: macos, os: macos-10.15}
249-
#- {pythonv: '3.7' , cibw_pyv: 37 , cibw_arch: x86_64,
250-
# cibw_platform: macosx_x86_64, osname: macos, os: macos-10.15}
251-
#- {pythonv: '3.6' , cibw_pyv: 36 , cibw_arch: x86_64,
252-
# cibw_platform: macosx_x86_64, osname: macos, os: macos-10.15}
169+
# pyv pyv arch platform os cmakeflags
170+
- ! python('3.13' 313 'x86_64' 'manylinux_x86_64' 'ubuntu-24.04' '')
171+
- ! python('3.13' 313 'i686' 'manylinux_i686' 'ubuntu-24.04' '')
172+
#- ! python('3.13' 313 'AMD64' 'win_amd64' 'windows-2022' '-G "Visual Studio 16 2019" -A x64')
173+
#- ! python('3.13' 313 'x86' 'win32' 'windows-2022' '-G "Visual Studio 16 2019" -A Win32')
174+
#- ! python('3.13' 313 'x86_64' 'macosx_x86_64' 'macosx-10.15' '')
175+
#
176+
- ! python('3.12' 312 'x86_64' 'manylinux_x86_64' 'ubuntu-24.04' '')
177+
- ! python('3.12' 312 'i686' 'manylinux_i686' 'ubuntu-24.04' '')
178+
#- ! python('3.12' 312 'AMD64' 'win_amd64' 'windows-2022' '-G "Visual Studio 16 2019" -A x64')
179+
#- ! python('3.12' 312 'x86' 'win32' 'windows-2022' '-G "Visual Studio 16 2019" -A Win32')
180+
#- ! python('3.12' 312 'x86_64' 'macosx_x86_64' 'macosx-10.15' '')
181+
#
182+
- ! python('3.11' 311 'x86_64' 'manylinux_x86_64' 'ubuntu-24.04' '')
183+
- ! python('3.11' 311 'i686' 'manylinux_i686' 'ubuntu-24.04' '')
184+
#- ! python('3.11' 311 'AMD64' 'win_amd64' 'windows-2022' '-G "Visual Studio 16 2019" -A x64')
185+
#- ! python('3.11' 311 'x86' 'win32' 'windows-2022' '-G "Visual Studio 16 2019" -A Win32')
186+
#- ! python('3.11' 311 'x86_64' 'macosx_x86_64' 'macosx-10.15' '')
187+
#
188+
- ! python('3.10' 310 'x86_64' 'manylinux_x86_64' 'ubuntu-24.04' '')
189+
- ! python('3.10' 310 'i686' 'manylinux_i686' 'ubuntu-24.04' '')
190+
#- ! python('3.10' 310 'AMD64' 'win_amd64' 'windows-2022' '-G "Visual Studio 16 2019" -A x64')
191+
#- ! python('3.10' 310 'x86' 'win32' 'windows-2022' '-G "Visual Studio 16 2019" -A Win32')
192+
#- ! python('3.10' 310 'x86_64' 'macosx_x86_64' 'macosx-10.15' '')
193+
#
194+
- ! python('3.9' 39 'x86_64' 'manylinux_x86_64' 'ubuntu-24.04' '')
195+
- ! python('3.9' 39 'i686' 'manylinux_i686' 'ubuntu-24.04' '')
196+
#- ! python('3.9' 39 'AMD64' 'win_amd64' 'windows-2022' '-G "Visual Studio 16 2019" -A x64')
197+
#- ! python('3.9' 39 'x86' 'win32' 'windows-2022' '-G "Visual Studio 16 2019" -A Win32')
198+
#- ! python('3.9' 39 'x86_64' 'macosx_x86_64' 'macosx-10.15' '')
199+
#
200+
- ! python('3.8' 38 'x86_64' 'manylinux_x86_64' 'ubuntu-24.04' '')
201+
- ! python('3.8' 38 'i686' 'manylinux_i686' 'ubuntu-24.04' '')
202+
#- ! python('3.8' 38 'AMD64' 'win_amd64' 'windows-2022' '-G "Visual Studio 16 2019" -A x64')
203+
#- ! python('3.8' 38 'x86' 'win32' 'windows-2022' '-G "Visual Studio 16 2019" -A Win32')
204+
#- ! python('3.8' 38 'x86_64' 'macosx_x86_64' 'macosx-10.15' '')
205+
#
206+
- ! python('3.7' 37 'x86_64' 'manylinux_x86_64' 'ubuntu-22.04' '')
207+
- ! python('3.7' 37 'i686' 'manylinux_i686' 'ubuntu-22.04' '')
208+
#- ! python('3.7' 37 'AMD64' 'win_amd64' 'windows-2022' '-G "Visual Studio 16 2019" -A x64')
209+
#- ! python('3.7' 37 'x86' 'win32' 'windows-2022' '-G "Visual Studio 16 2019" -A Win32')
210+
#- ! python('3.7' 37 'x86_64' 'macosx_x86_64' 'macosx-10.15' '')
211+
#
212+
- ! python('3.6' 36 'x86_64' 'manylinux_x86_64' 'ubuntu-20.04' '') # setup-python 3.6 requires ubuntu 20.04
213+
- ! python('3.6' 36 'i686' 'manylinux_i686' 'ubuntu-20.04' '') # setup-python 3.6 requires ubuntu 20.04
214+
#- ! python('3.6' 36 'AMD64' 'win_amd64' 'windows-2022' '-G "Visual Studio 16 2019" -A x64')
215+
#- ! python('3.6' 36 'x86' 'win32' 'windows-2022' '-G "Visual Studio 16 2019" -A Win32')
216+
#- ! python('3.6' 36 'x86_64' 'macosx_x86_64' 'macosx-10.15' '')
253217
steps:
254218
- :: checkout-action
255219
- name: create wheel
256-
uses: pypa/cibuildwheel@v2.17
220+
uses: pypa/cibuildwheel@v2.23
257221
- name: rename wheelhouse -> dist
258222
run: mv -fv wheelhouse dist
259223
- name: Verify artifacts

‎.github/workflows/release.yml‎

Lines changed: 83 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -290,110 +290,142 @@ jobs:
290290
fail-fast: false
291291
matrix:
292292
config:
293-
- pythonv: '3.12'
293+
- name: python/3.13/manylinux_x86_64
294+
sfx: python3.13-manylinux_x86_64
295+
os: ubuntu-24.04
296+
pythonv: '3.13'
297+
cibw_pyv: 313
298+
cibw_arch: x86_64
299+
cibw_platform: manylinux_x86_64
300+
cmakeflags: ''
301+
- name: python/3.13/manylinux_i686
302+
sfx: python3.13-manylinux_i686
303+
os: ubuntu-24.04
304+
pythonv: '3.13'
305+
cibw_pyv: 313
306+
cibw_arch: i686
307+
cibw_platform: manylinux_i686
308+
cmakeflags: ''
309+
- name: python/3.12/manylinux_x86_64
310+
sfx: python3.12-manylinux_x86_64
311+
os: ubuntu-24.04
312+
pythonv: '3.12'
294313
cibw_pyv: 312
295314
cibw_arch: x86_64
296315
cibw_platform: manylinux_x86_64
297-
name: python/3.12/linux/x86_64
298-
sfx: python3.12_linuxx86_64
299-
osname: linux
316+
cmakeflags: ''
317+
- name: python/3.12/manylinux_i686
318+
sfx: python3.12-manylinux_i686
300319
os: ubuntu-24.04
301-
- pythonv: '3.12'
320+
pythonv: '3.12'
302321
cibw_pyv: 312
303322
cibw_arch: i686
304323
cibw_platform: manylinux_i686
305-
name: python/3.12/linux/i686
306-
sfx: python3.12_linuxi686
307-
osname: linux
324+
cmakeflags: ''
325+
- name: python/3.11/manylinux_x86_64
326+
sfx: python3.11-manylinux_x86_64
308327
os: ubuntu-24.04
309-
- pythonv: '3.11'
328+
pythonv: '3.11'
310329
cibw_pyv: 311
311330
cibw_arch: x86_64
312331
cibw_platform: manylinux_x86_64
313-
name: python/3.11/linux/x86_64
314-
sfx: python3.11_linuxx86_64
315-
osname: linux
332+
cmakeflags: ''
333+
- name: python/3.11/manylinux_i686
334+
sfx: python3.11-manylinux_i686
316335
os: ubuntu-24.04
317-
- pythonv: '3.11'
336+
pythonv: '3.11'
318337
cibw_pyv: 311
319338
cibw_arch: i686
320339
cibw_platform: manylinux_i686
321-
name: python/3.11/linux/i686
322-
sfx: python3.11_linuxi686
323-
osname: linux
340+
cmakeflags: ''
341+
- name: python/3.10/manylinux_x86_64
342+
sfx: python3.10-manylinux_x86_64
324343
os: ubuntu-24.04
325-
- pythonv: '3.10'
344+
pythonv: '3.10'
326345
cibw_pyv: 310
327346
cibw_arch: x86_64
328347
cibw_platform: manylinux_x86_64
329-
name: python/3.10/linux/x86_64
330-
sfx: python3.10_linuxx86_64
331-
osname: linux
348+
cmakeflags: ''
349+
- name: python/3.10/manylinux_i686
350+
sfx: python3.10-manylinux_i686
332351
os: ubuntu-24.04
333-
- pythonv: '3.10'
352+
pythonv: '3.10'
334353
cibw_pyv: 310
335354
cibw_arch: i686
336355
cibw_platform: manylinux_i686
337-
name: python/3.10/linux/i686
338-
sfx: python3.10_linuxi686
339-
osname: linux
356+
cmakeflags: ''
357+
- name: python/3.9/manylinux_x86_64
358+
sfx: python3.9-manylinux_x86_64
340359
os: ubuntu-24.04
341-
- pythonv: '3.9'
360+
pythonv: '3.9'
342361
cibw_pyv: 39
343362
cibw_arch: x86_64
344363
cibw_platform: manylinux_x86_64
345-
name: python/3.9/linux/x86_64
346-
sfx: python3.9_linuxx86_64
347-
osname: linux
364+
cmakeflags: ''
365+
- name: python/3.9/manylinux_i686
366+
sfx: python3.9-manylinux_i686
348367
os: ubuntu-24.04
349-
- pythonv: '3.9'
368+
pythonv: '3.9'
350369
cibw_pyv: 39
351370
cibw_arch: i686
352371
cibw_platform: manylinux_i686
353-
name: python/3.9/linux/i686
354-
sfx: python3.9_linuxi686
355-
osname: linux
372+
cmakeflags: ''
373+
- name: python/3.8/manylinux_x86_64
374+
sfx: python3.8-manylinux_x86_64
356375
os: ubuntu-24.04
357-
- pythonv: '3.8'
376+
pythonv: '3.8'
358377
cibw_pyv: 38
359378
cibw_arch: x86_64
360379
cibw_platform: manylinux_x86_64
361-
name: python/3.8/linux/x86_64
362-
sfx: python3.8_linuxx86_64
363-
osname: linux
380+
cmakeflags: ''
381+
- name: python/3.8/manylinux_i686
382+
sfx: python3.8-manylinux_i686
364383
os: ubuntu-24.04
365-
- pythonv: '3.8'
384+
pythonv: '3.8'
366385
cibw_pyv: 38
367386
cibw_arch: i686
368387
cibw_platform: manylinux_i686
369-
name: python/3.8/linux/i686
370-
sfx: python3.8_linuxi686
371-
osname: linux
372-
os: ubuntu-24.04
373-
- pythonv: '3.7'
388+
cmakeflags: ''
389+
- name: python/3.7/manylinux_x86_64
390+
sfx: python3.7-manylinux_x86_64
391+
os: ubuntu-22.04
392+
pythonv: '3.7'
374393
cibw_pyv: 37
375394
cibw_arch: x86_64
376395
cibw_platform: manylinux_x86_64
377-
name: python/3.7/linux/x86_64
378-
sfx: python3.7_linuxx86_64
379-
osname: linux
396+
cmakeflags: ''
397+
- name: python/3.7/manylinux_i686
398+
sfx: python3.7-manylinux_i686
380399
os: ubuntu-22.04
381-
- pythonv: '3.7'
400+
pythonv: '3.7'
382401
cibw_pyv: 37
383402
cibw_arch: i686
384403
cibw_platform: manylinux_i686
385-
name: python/3.7/linux/i686
386-
sfx: python3.7_linuxi686
387-
osname: linux
388-
os: ubuntu-22.04
404+
cmakeflags: ''
405+
- name: python/3.6/manylinux_x86_64
406+
sfx: python3.6-manylinux_x86_64
407+
os: ubuntu-20.04
408+
pythonv: '3.6'
409+
cibw_pyv: 36
410+
cibw_arch: x86_64
411+
cibw_platform: manylinux_x86_64
412+
cmakeflags: ''
413+
- name: python/3.6/manylinux_i686
414+
sfx: python3.6-manylinux_i686
415+
os: ubuntu-20.04
416+
pythonv: '3.6'
417+
cibw_pyv: 36
418+
cibw_arch: i686
419+
cibw_platform: manylinux_i686
420+
cmakeflags: ''
389421
steps:
390422
- name: checkout (action)
391423
uses: actions/checkout@v4
392424
with:
393425
submodules: recursive
394426
fetch-depth: 0
395427
- name: create wheel
396-
uses: pypa/cibuildwheel@v2.17
428+
uses: pypa/cibuildwheel@v2.23
397429
- name: rename wheelhouse -> dist
398430
run: mv -fv wheelhouse dist
399431
- name: Verify artifacts

0 commit comments

Comments
 (0)