From 490e2561b1f3e4e0058ede83ec104cd4973ba779 Mon Sep 17 00:00:00 2001
From: Bill Little <bill.james.little@gmail.com>
Date: Fri, 4 Jun 2021 08:53:58 +0100
Subject: [PATCH 1/3] add enchant support

---
 .cirrus.yml                | 12 ++++++++++++
 requirements/ci/Dockerfile | 12 ++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 requirements/ci/Dockerfile

diff --git a/.cirrus.yml b/.cirrus.yml
index cc3aadaaa8..8c6d528073 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -189,6 +189,10 @@ gallery_task:
   env:
     PY_VER: 3.8
   name: "${CIRRUS_OS}: py${PY_VER} doc tests (gallery)"
+  container:
+    dockerfile: requirements/ci/Dockerfile
+    cpu: 2
+    memory: 4G
   << : *IRIS_TEST_DATA_TEMPLATE
   << : *LINUX_TASK_TEMPLATE
   tests_script:
@@ -210,6 +214,10 @@ doctest_task:
     MPL_RC_DIR: ${HOME}/.config/matplotlib
     MPL_RC_FILE: ${HOME}/.config/matplotlib/matplotlibrc
   name: "${CIRRUS_OS}: py${PY_VER} doc tests"
+  container:
+    dockerfile: requirements/ci/Dockerfile
+    cpu: 2
+    memory: 4G
   << : *IRIS_TEST_DATA_TEMPLATE
   << : *LINUX_TASK_TEMPLATE
   tests_script:
@@ -234,6 +242,10 @@ doccheck_task:
     MPL_RC_DIR: ${HOME}/.config/matplotlib
     MPL_RC_FILE: ${HOME}/.config/matplotlib/matplotlibrc
   name: "${CIRRUS_OS}: py${PY_VER} doc check"
+  container:
+    dockerfile: requirements/ci/Dockerfile
+    cpu: 2
+    memory: 4G
   << : *LINUX_TASK_TEMPLATE
   tests_script:
     - export CONDA_OVERRIDE_LINUX="$(uname -r | cut -d'+' -f1)"
diff --git a/requirements/ci/Dockerfile b/requirements/ci/Dockerfile
new file mode 100644
index 0000000000..eed0efa6d4
--- /dev/null
+++ b/requirements/ci/Dockerfile
@@ -0,0 +1,12 @@
+FROM gcc:latest
+
+LABEL author="scitools" \
+      version="0.1" \
+      description="Docker image with gcc and enchant"
+
+#
+# install system-level dependencies
+#
+RUN apt update -y \
+  && apt upgrade -y \
+  && apt install -y enchant

From 1212c05d42f5a92b2a753589f84077af0139ca09 Mon Sep 17 00:00:00 2001
From: Bill Little <bill.james.little@gmail.com>
Date: Fri, 4 Jun 2021 11:06:03 +0100
Subject: [PATCH 2/3] rename to debian based enchant-2

---
 requirements/ci/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/requirements/ci/Dockerfile b/requirements/ci/Dockerfile
index eed0efa6d4..38abea59b3 100644
--- a/requirements/ci/Dockerfile
+++ b/requirements/ci/Dockerfile
@@ -7,6 +7,6 @@ LABEL author="scitools" \
 #
 # install system-level dependencies
 #
-RUN apt update -y \
-  && apt upgrade -y \
-  && apt install -y enchant
+RUN apt-get update -y \
+  && apt-get upgrade -y \
+  && apt-get install -y enchant-2

From 65ee71634f941918606edf63549f59bbd8200237 Mon Sep 17 00:00:00 2001
From: Bill Little <bill.james.little@gmail.com>
Date: Fri, 4 Jun 2021 12:14:59 +0100
Subject: [PATCH 3/3] move spelling pip install to noxfile

---
 noxfile.py               | 3 +++
 requirements/ci/py36.yml | 4 ----
 requirements/ci/py37.yml | 4 ----
 requirements/ci/py38.yml | 4 ----
 4 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/noxfile.py b/noxfile.py
index 225ed0b4dd..1ec7948ae5 100755
--- a/noxfile.py
+++ b/noxfile.py
@@ -232,6 +232,7 @@ def gallery(session: nox.sessions.Session):
     """
     prepare_venv(session)
     session.install("--no-deps", "--editable", ".")
+    session.install("sphinxcontrib-spelling", "pyenchant")
     session.run(
         "python",
         "-m",
@@ -253,6 +254,7 @@ def doctest(session: nox.sessions.Session):
     """
     prepare_venv(session)
     session.install("--no-deps", "--editable", ".")
+    session.install("sphinxcontrib-spelling", "pyenchant")
     session.cd("docs")
     session.run(
         "make",
@@ -280,6 +282,7 @@ def doccheck(session: nox.sessions.Session):
     """
     prepare_venv(session)
     session.install("--no-deps", "--editable", ".")
+    session.install("sphinxcontrib-spelling", "pyenchant")
     session.cd("docs")
     session.run(
         "make",
diff --git a/requirements/ci/py36.yml b/requirements/ci/py36.yml
index b95025cace..f778704803 100644
--- a/requirements/ci/py36.yml
+++ b/requirements/ci/py36.yml
@@ -50,7 +50,3 @@ dependencies:
   - sphinx-gallery
   - sphinx-panels
   - sphinx_rtd_theme
-  - pip
-  - pip:
-    - sphinxcontrib-spelling
-    - pyenchant
diff --git a/requirements/ci/py37.yml b/requirements/ci/py37.yml
index 17b47d7533..5b21e9f778 100644
--- a/requirements/ci/py37.yml
+++ b/requirements/ci/py37.yml
@@ -50,7 +50,3 @@ dependencies:
   - sphinx-gallery
   - sphinx-panels
   - sphinx_rtd_theme
-  - pip
-  - pip:
-    - sphinxcontrib-spelling
-    - pyenchant
diff --git a/requirements/ci/py38.yml b/requirements/ci/py38.yml
index 3d035bc40f..e09a7a7164 100644
--- a/requirements/ci/py38.yml
+++ b/requirements/ci/py38.yml
@@ -50,7 +50,3 @@ dependencies:
   - sphinx-gallery
   - sphinx-panels
   - sphinx_rtd_theme
-  - pip
-  - pip:
-    - sphinxcontrib-spelling
-    - pyenchant