From 61aea385103d8dfc105320854ef40a080d34773a Mon Sep 17 00:00:00 2001
From: Kyle Sunden <git@ksunden.space>
Date: Mon, 18 Sep 2023 16:34:28 -0500
Subject: [PATCH] Backport PR #26799: Update kiwisolver and pillow versions to
 be consistent with requirements

Merge pull request #26799 from oscargus/kiwiversion

Update kiwisolver and pillow versions to be consistent with requirements

(cherry picked from commit ca52d680f2db945c15bfe3f98b601177501a8974)

Conflict was because numpy is pinned to `<2` on the release branch but not on main
---
 environment.yml               | 4 ++--
 lib/matplotlib/__init__.py    | 2 +-
 requirements/testing/mypy.txt | 4 ++--
 setup.py                      | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/environment.yml b/environment.yml
index c35b90e9acba..7b13735bb172 100644
--- a/environment.yml
+++ b/environment.yml
@@ -14,9 +14,9 @@ dependencies:
   - cycler>=0.10.0
   - fonttools>=4.22.0
   - importlib-resources>=3.2.0
-  - kiwisolver>=1.0.1
+  - kiwisolver>=1.3.1
   - numpy>=1.21
-  - pillow>=6.2
+  - pillow>=8
   - pybind11>=2.6.0
   - pygobject
   - pyparsing>=2.3.1
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
index 1e3dab1b336b..353406832c4b 100644
--- a/lib/matplotlib/__init__.py
+++ b/lib/matplotlib/__init__.py
@@ -246,7 +246,7 @@ def _check_versions():
     for modname, minver in [
             ("cycler", "0.10"),
             ("dateutil", "2.7"),
-            ("kiwisolver", "1.0.1"),
+            ("kiwisolver", "1.3.1"),
             ("numpy", "1.21"),
             ("pyparsing", "2.3.1"),
     ]:
diff --git a/requirements/testing/mypy.txt b/requirements/testing/mypy.txt
index 801601bcd6eb..f697772da5ea 100644
--- a/requirements/testing/mypy.txt
+++ b/requirements/testing/mypy.txt
@@ -17,10 +17,10 @@ sphinx
 contourpy>=1.0.1
 cycler>=0.10
 fonttools>=4.22.0
-kiwisolver>=1.0.1
+kiwisolver>=1.3.1
 numpy>=1.19
 packaging>=20.0
-pillow>=6.2.0
+pillow>=8
 pyparsing>=2.3.1
 python-dateutil>=2.7
 setuptools_scm>=7
diff --git a/setup.py b/setup.py
index a876f6e35065..9c37c2108286 100644
--- a/setup.py
+++ b/setup.py
@@ -332,10 +332,10 @@ def make_release_tree(self, base_dir, files):
         "contourpy>=1.0.1",
         "cycler>=0.10",
         "fonttools>=4.22.0",
-        "kiwisolver>=1.0.1",
+        "kiwisolver>=1.3.1",
         "numpy>=1.21,<2",
         "packaging>=20.0",
-        "pillow>=6.2.0",
+        "pillow>=8",
         "pyparsing>=2.3.1",
         "python-dateutil>=2.7",
     ] + (