From a7307af66f891f15fd6c166137f5016cab4e473c Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Fri, 18 Aug 2023 01:53:59 -0400 Subject: [PATCH 1/2] Add ninja to Cygwin builder Since there are no contourpy wheels, it must be built from source, and pre-packaged ninja is better than trying to build from sdist. --- .github/workflows/cygwin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml index 652a09e45953..67b1af162914 100644 --- a/.github/workflows/cygwin.yml +++ b/.github/workflows/cygwin.yml @@ -86,7 +86,7 @@ jobs: with: packages: >- ccache gcc-g++ gdb git graphviz libcairo-devel libffi-devel - libgeos-devel libQt5Core-devel pkgconf libglib2.0-devel + libgeos-devel libQt5Core-devel pkgconf libglib2.0-devel ninja noto-cjk-fonts python3${{ matrix.python-minor-version }}-devel python3${{ matrix.python-minor-version }}-pip From 7ea04e7d96d69b509ec60272242e5ad3f3e5de7d Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Fri, 18 Aug 2023 22:44:54 -0400 Subject: [PATCH 2/2] Install contourpy without build isolation on Cygwin --- .github/workflows/cygwin.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml index 67b1af162914..b4b30b57dab1 100644 --- a/.github/workflows/cygwin.yml +++ b/.github/workflows/cygwin.yml @@ -177,7 +177,10 @@ jobs: python -m pip install --upgrade pip 'setuptools<60' wheel python -m pip install kiwisolver 'numpy!=1.21.*' pillow importlib_resources grep -v -F -e psutil requirements/testing/all.txt >requirements_test.txt - python -m pip install --upgrade 'contourpy>=1.0.1' cycler fonttools \ + python -m pip install meson-python pybind11 + export PATH="/usr/local/bin:$PATH" + python -m pip install --no-build-isolation 'contourpy>=1.0.1' + python -m pip install --upgrade cycler fonttools \ packaging pyparsing python-dateutil setuptools-scm \ -r requirements_test.txt sphinx ipython python -m pip install --upgrade pycairo 'cairocffi>=0.8' PyGObject &&