From 814efdb25e4d724e31878caa2bd47197db78b277 Mon Sep 17 00:00:00 2001
From: Grejdi Gjura <ggjura@mbta.com>
Date: Wed, 20 Sep 2023 21:55:51 -0400
Subject: [PATCH] fix: fix versions for building local and on github

---
 .github/workflows/glue-python-deploy.yaml | 2 +-
 .tool-versions                            | 4 ++--
 docker/Dockerfile.glue_2_0__local         | 3 ++-
 docker/Dockerfile.glue_3_0__local         | 3 ++-
 py_cubic_ingestion/pyproject.toml         | 3 ++-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/glue-python-deploy.yaml b/.github/workflows/glue-python-deploy.yaml
index 00f4329c..a289db4d 100644
--- a/.github/workflows/glue-python-deploy.yaml
+++ b/.github/workflows/glue-python-deploy.yaml
@@ -58,7 +58,7 @@ jobs:
       - name: Prepare for installing dependencies and package
         working-directory: ${{github.workspace}}/py_cubic_ingestion
         run: |
-          poetry export --output requirements.txt
+          poetry export --without-hashes --output requirements.txt
           poetry build
       - name: Install dependencies and py_cubic_ingestion package into 'libs'
         working-directory: ${{github.workspace}}/py_cubic_ingestion
diff --git a/.tool-versions b/.tool-versions
index 7a25bb66..20ddc507 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -2,6 +2,6 @@ adr-tools 3.0.0
 elixir 1.13.2-otp-24
 erlang 24.2.1
 java openjdk-11
-poetry 1.4.2
-python 3.7.12
+poetry 1.3.2
+python 3.7.17
 terraform 1.1.8
diff --git a/docker/Dockerfile.glue_2_0__local b/docker/Dockerfile.glue_2_0__local
index 714b2c11..786e251d 100644
--- a/docker/Dockerfile.glue_2_0__local
+++ b/docker/Dockerfile.glue_2_0__local
@@ -31,7 +31,8 @@ ENV SPARK_HOME=/spark-2.4.3-bin-spark-2.4.3-bin-hadoop2.8
 RUN /glue/bin/gluesparksubmit --version
 
 # python packaging
-RUN pip install poetry
+### Note: This version here needs to match .tool-versions
+RUN pip install poetry==1.3.2
 # install py_cubic_ingestion's required python dependencies
 COPY ./py_cubic_ingestion /data_platform/py_cubic_ingestion
 WORKDIR /data_platform/py_cubic_ingestion
diff --git a/docker/Dockerfile.glue_3_0__local b/docker/Dockerfile.glue_3_0__local
index 79be794e..fc7e707a 100644
--- a/docker/Dockerfile.glue_3_0__local
+++ b/docker/Dockerfile.glue_3_0__local
@@ -32,7 +32,8 @@ ENV SPARK_HOME=/spark-3.1.1-amzn-0-bin-3.2.1-amzn-3
 RUN /glue/bin/gluesparksubmit --version
 
 # python packaging
-RUN pip install poetry
+### Note: This version here needs to match .tool-versions
+RUN pip install poetry==1.3.2
 # install py_cubic_ingestion's required python dependencies
 COPY ./py_cubic_ingestion /data_platform/py_cubic_ingestion
 WORKDIR /data_platform/py_cubic_ingestion
diff --git a/py_cubic_ingestion/pyproject.toml b/py_cubic_ingestion/pyproject.toml
index 4293bcc6..c31d6acc 100644
--- a/py_cubic_ingestion/pyproject.toml
+++ b/py_cubic_ingestion/pyproject.toml
@@ -9,7 +9,8 @@ packages = [
 ]
 
 [tool.poetry.dependencies]
-python = "3.7.12"
+### Note: This version here needs to match .tool-versions
+python = "3.7.17"
 python-dateutil = "^2.8.2"
 boto3-stubs = {extras = ["glue"], version = "^1.24.23"}