From d4bae12eba7095515c841d84a4e78cbd093ed718 Mon Sep 17 00:00:00 2001
From: David Stansby <dstansby@gmail.com>
Date: Mon, 3 Jan 2022 16:24:25 +0000
Subject: [PATCH] Pin numpy to < 1.22

---
 .github/workflows/tests.yml | 2 +-
 setup.py                    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index b24eb59d3d2c..654a8b9e1279 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -157,7 +157,7 @@ jobs:
 
           # Install dependencies from PyPI.
           python -m pip install --upgrade $PRE \
-            cycler fonttools kiwisolver numpy packaging pillow pyparsing \
+            cycler fonttools kiwisolver "numpy<1.22" packaging pillow pyparsing \
             python-dateutil setuptools-scm \
             -r requirements/testing/all.txt \
             ${{ matrix.extra-requirements }}
diff --git a/setup.py b/setup.py
index 4282195dbad5..1f850aab6ec6 100644
--- a/setup.py
+++ b/setup.py
@@ -308,7 +308,7 @@ def make_release_tree(self, base_dir, files):
     python_requires='>={}'.format('.'.join(str(n) for n in py_min_version)),
     setup_requires=[
         "certifi>=2020.06.20",
-        "numpy>=1.17",
+        "numpy>=1.17,<1.22",
         "setuptools_scm>=4",
         "setuptools_scm_git_archive",
     ],
@@ -316,7 +316,7 @@ def make_release_tree(self, base_dir, files):
         "cycler>=0.10",
         "fonttools>=4.22.0",
         "kiwisolver>=1.0.1",
-        "numpy>=1.17",
+        "numpy>=1.17,<1.22",
         "packaging>=20.0",
         "pillow>=6.2.0",
         "pyparsing>=2.2.1,<3.0.0",