From 9ebc8ff72aa11ef8350f9c4575d32e3c79136f5d Mon Sep 17 00:00:00 2001
From: Murray Stevenson <50844517+murraystevenson@users.noreply.github.com>
Date: Tue, 16 Jan 2024 10:31:51 -0800
Subject: [PATCH] Dockerfile : Lock down `sphinxcontrib` versions

Otherwise a simple `pip install sphinx==4.3.1` can pull in incompatible sphinxcontrib versions that prevent sphinx from running. Removing these packages also prevents sphinx from running, so we need to install specific versions of each...
---
 Changes.md | 6 ++++++
 Dockerfile | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/Changes.md b/Changes.md
index a944ffa..f4d5973 100644
--- a/Changes.md
+++ b/Changes.md
@@ -1,3 +1,9 @@
+3.0.0ax
+=======
+
+- Dockerfile :
+  - Fixed `sphinx` incompatibility with automatically installed dependencies by installing specific versions of `sphinxcontrib` packages.
+
 3.0.0a3
 =======
 
diff --git a/Dockerfile b/Dockerfile
index 68f36bf..46a758d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -46,6 +46,12 @@ RUN yum install -y 'dnf-command(versionlock)' && \
 # (in GafferHQ/gaffer).
 	pip install \
 		sphinx==4.3.1 \
+		sphinxcontrib-applehelp==1.0.4 \
+		sphinxcontrib-devhelp==1.0.2 \
+		sphinxcontrib-htmlhelp==2.0.1 \
+		sphinxcontrib-jsmath==1.0.1 \
+		sphinxcontrib-serializinghtml==1.1.5 \
+		sphinxcontrib-qthelp==1.0.3 \
 		sphinx_rtd_theme==1.0.0 \
 		myst-parser==0.15.2 \
 		docutils==0.17.1 && \