From a1d89b10fb0586bd281e98467475916019e84e89 Mon Sep 17 00:00:00 2001
From: Martin Peck <martin@meedan.com>
Date: Fri, 27 Sep 2024 13:02:40 -0700
Subject: [PATCH 1/4] Build and deploy for this branch.

---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ba658498..482799a2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,6 +22,7 @@ build_qa:
     - docker push "$ECR_API_BASE_URL/qa/alegre/api:latest"
   only:
     - develop
+    - bugfix/setuptools-deps
 
 deploy_qa:
   image: python:3-alpine
@@ -56,6 +57,7 @@ deploy_qa:
     - echo "new Image was deployed $QA_ECR_API_BASE_URL:$CI_COMMIT_SHA"
   only:
     - develop
+    - bugfix/setuptools-deps
 
 build_live:
   image: registry.gitlab.com/gitlab-org/cloud-deploy/aws-base:latest

From f65d0481f1ad80eaba272c2f77a58c0c19ede6ed Mon Sep 17 00:00:00 2001
From: Martin Peck <martin@meedan.com>
Date: Fri, 27 Sep 2024 13:05:43 -0700
Subject: [PATCH 2/4] Update setuptools.

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 482799a2..3977e164 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,6 +36,7 @@ deploy_qa:
     AWS_DEFAULT_REGION: $AWS_DEFAULT_REGION
   script:
     - apk add --no-cache curl python3 py3-pip git
+    - pip install setuptools
     - pip install urllib3==2.0.6
     - pip install botocore==1.31.62
     - pip install boto3==1.28.62

From 4c175ab914f5fdc24e3efbdefc6f3714c117a5cf Mon Sep 17 00:00:00 2001
From: Martin Peck <martin@meedan.com>
Date: Fri, 27 Sep 2024 13:36:40 -0700
Subject: [PATCH 3/4] Pin setuptools to 75.1.0.

---
 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3977e164..74fca87b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,7 +36,7 @@ deploy_qa:
     AWS_DEFAULT_REGION: $AWS_DEFAULT_REGION
   script:
     - apk add --no-cache curl python3 py3-pip git
-    - pip install setuptools
+    - pip install setuptools==75.1.0
     - pip install urllib3==2.0.6
     - pip install botocore==1.31.62
     - pip install boto3==1.28.62
@@ -91,6 +91,7 @@ deploy_live:
     AWS_DEFAULT_REGION: $AWS_DEFAULT_REGION
   script:
     - apk add --no-cache curl jq python3 py3-pip git
+    - pip install setuptools==75.1.0
     - pip install urllib3==2.0.6
     - pip install botocore==1.31.62
     - pip install boto3==1.28.62

From 285b6af7f852dbd004faa8cf9a97ac74c8ae2c06 Mon Sep 17 00:00:00 2001
From: Martin Peck <martin@meedan.com>
Date: Fri, 27 Sep 2024 13:52:05 -0700
Subject: [PATCH 4/4] Remove build and deploy for this branch in preparation
 for merge.

---
 .gitlab-ci.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 74fca87b..b89e6bef 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,6 @@ build_qa:
     - docker push "$ECR_API_BASE_URL/qa/alegre/api:latest"
   only:
     - develop
-    - bugfix/setuptools-deps
 
 deploy_qa:
   image: python:3-alpine
@@ -58,7 +57,6 @@ deploy_qa:
     - echo "new Image was deployed $QA_ECR_API_BASE_URL:$CI_COMMIT_SHA"
   only:
     - develop
-    - bugfix/setuptools-deps
 
 build_live:
   image: registry.gitlab.com/gitlab-org/cloud-deploy/aws-base:latest