8000 Merge pull request #26564 from meeseeksmachine/auto-backport-of-pr-26… · matplotlib/matplotlib@8bcceb5 · GitHub
[go: up one dir, main page]

Skip to content

Commit 8bcceb5

Browse files
authored
Merge pull request #26564 from meeseeksmachine/auto-backport-of-pr-26543-on-v3.8.x
Backport PR #26543 on branch v3.8.x (Add ninja to Cygwin builder)
2 parents 6ab8dbb + 1a17ec1 commit 8bcceb5

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

.github/workflows/cygwin.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
with:
8787
packages: >-
8888
ccache gcc-g++ gdb git graphviz libcairo-devel libffi-devel
89-
libgeos-devel libQt5Core-devel pkgconf libglib2.0-devel
89+
libgeos-devel libQt5Core-devel pkgconf libglib2.0-devel ninja
9090
noto-cjk-fonts
9191
python3${{ matrix.python-minor-version }}-devel
9292
python3${{ matrix.python-minor-version }}-pip
@@ -177,7 +177,10 @@ jobs:
177177
python -m pip install --upgrade pip 'setuptools<60' wheel
178178
python -m pip install kiwisolver 'numpy!=1.21.*' pillow importlib_resources
179179
grep -v -F -e psutil requirements/testing/all.txt >requirements_test.txt
180-
python -m pip install --upgrade 'contourpy>=1.0.1' cycler fonttools \
180+
python -m pip install meson-python pybind11
181+
export PATH="/usr/local/bin:$PATH"
182+
python -m pip install --no-build-isolation 'contourpy>=1.0.1'
183+
python -m pip install --upgrade cycler fonttools \
181184
packaging pyparsing python-dateutil setuptools-scm \
182185
-r requirements_test.txt sphinx ipython
183186
python -m pip install --upgrade pycairo 'cairocffi>=0.8' PyGObject &&

0 commit comments

Comments
 (0)
0