Backport PR #26799: Update kiwisolver and pillow versions to be consistent with requirements

ksunden · ksunden · commit 61aea385103d · 2023-09-18T16:37:13.000-05:00
Merge pull request #26799 from oscargus/kiwiversion Update kiwisolver and pillow versions to be consistent with requirements (cherry picked from commit ca52d68) Conflict was because numpy is pinned to `<2` on the release branch but not on main
diff --git 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
@@ -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
@@ -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
@@ -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",
     ] + (
