From 05f0da10bf880aa3f18c7b031a8f5ef73af38aa8 Mon Sep 17 00:00:00 2001
From: Philip de Nier <philipn@rd.bbc.co.uk>
Date: Thu, 5 Sep 2024 10:43:10 +0100
Subject: [PATCH] TEST install setuptools

---
 .github/workflows/ci-workflow.yml                      | 4 ++--
 static-commontooling/docker/Dockerfile_multi_macros.j2 | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
index 54a12a6..f7ffb14 100644
--- a/.github/workflows/ci-workflow.yml
+++ b/.github/workflows/ci-workflow.yml
@@ -32,7 +32,7 @@ on:
       commontoolingBranch:
         description: 'Commontooling branch or tag to use'
         required: true
-        default: 'main'
+        default: 'philipn-install-python-setuptools'
         type: string
 
 jobs:
@@ -48,5 +48,5 @@ jobs:
       # workflow_dispatch inputs are always strings. Convert to boolean.
       forceDocsUpload: ${{ inputs.forceDocsUpload == true }}
       pythonVersion: ${{ inputs.pythonVersion || '3.10' }}
-      commontoolingBranch: ${{ inputs.commontoolingBranch || 'main' }}
+      commontoolingBranch: ${{ inputs.commontoolingBranch || 'philipn-install-python-setuptools' }}
     secrets: inherit
diff --git a/static-commontooling/docker/Dockerfile_multi_macros.j2 b/static-commontooling/docker/Dockerfile_multi_macros.j2
index 9fd3eb7..a1c3d3e 100644
--- a/static-commontooling/docker/Dockerfile_multi_macros.j2
+++ b/static-commontooling/docker/Dockerfile_multi_macros.j2
@@ -27,6 +27,7 @@ COPY --from=api /api ./{{ modname }}/apidocs
 {% endif -%}
 COPY . .
 
+RUN pip install setuptools
 RUN python3 setup.py sdist
 {%- endmacro %}