File tree Expand file tree Collapse file tree 4 files changed +53
-3
lines changed
Expand file tree Collapse file tree 4 files changed +53
-3
lines changed Original file line number Diff line number Diff line change 4444 fetch-depth : 0
4545 persist-credentials : false
4646
47+ - name : Preload test images
48+ run : |
49+ git config --global user.name 'Matplotlib'
50+ git config --global user.email 'nobody@matplotlib.org'
51+ git fetch https://github.com/QuLogic/matplotlib.git text-overhaul-figures:text-overhaul-figures
52+ git merge --no-commit text-overhaul-figures || true
53+ # If there are any conflicts in baseline images, then pick "ours",
54+ # which should be the updated images in the PR.
55+ conflicts=$(git diff --name-only --diff-filter=U \
56+ lib/matplotlib/tests/baseline_images \
57+ lib/mpl_toolkits/*/tests/baseline_images)
58+ if [ -n "${conflicts}" ]; then
59+ git checkout --ours -- ${conflicts}
60+ git add -- ${conflicts}
61+ fi
62+ # If committing fails, there were conflicts other than the baseline images,
63+ # which should not be allowed to happen, and should fail the build.
64+ git commit -m 'Preload test images from branch text-overhaul-figures'
65+
4766 - uses : actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
4867 name : Install Python
4968 with :
5473 env :
5574 CIBW_BUILD : " cp312-*"
5675 CIBW_PLATFORM : " pyodide"
76+ CIBW_TEST_COMMAND : " true"
5777
5878 - uses : actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
5979 with :
Original file line number Diff line number Diff line change @@ -417,7 +417,10 @@ test-command = [
417417 cp -a {package}/lib/${subdir}/tests/baseline_images $basedir/${subdir}/tests/
418418 done""" ,
419419 # Test installed, not repository, copy as we aren't using an editable install.
420- " pytest -p no:cacheprovider --pyargs matplotlib mpl_toolkits.axes_grid1 mpl_toolkits.axisartist mpl_toolkits.mplot3d" ,
420+ """ \
421+ pytest -p no:cacheprovider --pyargs \
422+ matplotlib mpl_toolkits.axes_grid1 mpl_toolkits.axisartist mpl_toolkits.mplot3d \
423+ -k 'not test_complex_shaping'""" ,
421424]
422425[tool .cibuildwheel .pyodide .environment ]
423426# Exceptions are needed for pybind11:
Original file line number Diff line number Diff line change @@ -8,8 +8,9 @@ source_fallback_url = https://downloads.sourceforge.net/project/freetype/freetyp
88source_filename = freetype-2.14.1.tar.xz
99source_hash = 32427e8c471ac095853212a37aef816c60b42052d4d9e48230bab3bdf2936ccc
1010
11- # This patch allows using our bundled HarfBuzz.
12- diff_files = freetype-2.14.1-static-harfbuzz.patch
11+ # First patch allows using our bundled HarfBuzz.
12+ # Second patch fixes symbol problems on wasm.
13+ diff_files = freetype-2.14.1-static-harfbuzz.patch, freetype-2.14.1-wasm-visibility.patch
1314
1415[provide]
1516freetype2 = freetype_dep
Original file line number Diff line number Diff line change 1+ diff -uPNr freetype-2.14.3.orig/meson.build freetype-2.14.3/meson.build
2+ --- freetype-2.14.3.orig/meson.build 2026-03-27 05:26:03.270830734 -0400
3+ +++ freetype-2.14.3/meson.build 2026-03-27 16:19:46.222942478 -0400
4+ @@ -453,16 +453,21 @@
5+ ft2_defines += ['-DFT_CONFIG_CONFIG_H=<ftconfig.h>']
6+ endif
7+
8+ + if cc.get_id() == 'emscripten'
9+ + kwargs = {}
10+ + else
11+ + kwargs = {'gnu_symbol_visibility': 'hidden'}
12+ + endif
13+
14+ ft2_lib = library('freetype',
15+ sources: ft2_sources + [ftmodule_h],
16+ c_args: ft2_defines,
17+ - gnu_symbol_visibility: 'hidden',
18+ include_directories: ft2_includes,
19+ dependencies: ft2_deps,
20+ install: true,
21+ version: ft2_so_version,
22+ link_args: common_ldflags,
23+ + kwargs: kwargs,
24+ )
25+
26+
You can’t perform that action at this time.
0 commit comments