Backport PR matplotlib#29748: Fix PyGObject version pinning in macOS tests

tacaswell · ksunden · commit e6a173074973 · 2025-08-21T13:02:14.000-05:00
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -246,11 +246,7 @@ jobs:
           # (sometimes, the install appears to be successful but shared
           # libraries cannot be loaded at runtime, so an actual import is a
           # better check).
-<<<<<<< HEAD
           python -m pip install --upgrade pycairo 'cairocffi>=0.8' 'PyGObject${{ matrix.pygobject-ver }}' &&
-=======
-          python -m pip install --upgrade pycairo 'cairocffi>=0.8' PyGObject${{ matrix.pygobject-ver }} &&
->>>>>>> 3ac78ff70b (Backport PR #29734: ci: MacOS 14: temporarily upper-bound the 'PyGObject' Python package version)
             (
               python -c 'import gi; gi.require_version("Gtk", "4.0"); from gi.repository import Gtk' &&
               echo 'PyGObject 4 is available' || echo 'PyGObject 4 is not available'
