Skip to content

Commit 0d9e31c

Browse files
authored
Merge pull request #100 from mbta/gg-fix-versions-for-building
[env+ga] fix: fix versions for building local and on github
2 parents b3ac89b + 814efdb commit 0d9e31c

File tree

5 files changed

+9
-6
lines changed

5 files changed

+9
-6
lines changed

.github/workflows/glue-python-deploy.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
- name: Prepare for installing dependencies and package
5959
working-directory: ${{github.workspace}}/py_cubic_ingestion
6060
run: |
61-
poetry export --output requirements.txt
61+
poetry export --without-hashes --output requirements.txt
6262
poetry build
6363
- name: Install dependencies and py_cubic_ingestion package into 'libs'
6464
working-directory: ${{github.workspace}}/py_cubic_ingestion

.tool-versions

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ adr-tools 3.0.0
22
elixir 1.13.2-otp-24
33
erlang 24.2.1
44
java openjdk-11
5-
poetry 1.4.2
6-
python 3.7.12
5+
poetry 1.3.2
6+
python 3.7.17
77
terraform 1.1.8

docker/Dockerfile.glue_2_0__local

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ ENV SPARK_HOME=/spark-2.4.3-bin-spark-2.4.3-bin-hadoop2.8
3131
RUN /glue/bin/gluesparksubmit --version
3232

3333
# python packaging
34-
RUN pip install poetry
34+
### Note: This version here needs to match .tool-versions
35+
RUN pip install poetry==1.3.2
3536
# install py_cubic_ingestion's required python dependencies
3637
COPY ./py_cubic_ingestion /data_platform/py_cubic_ingestion
3738
WORKDIR /data_platform/py_cubic_ingestion

docker/Dockerfile.glue_3_0__local

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ ENV SPARK_HOME=/spark-3.1.1-amzn-0-bin-3.2.1-amzn-3
3232
RUN /glue/bin/gluesparksubmit --version
3333

3434
# python packaging
35-
RUN pip install poetry
35+
### Note: This version here needs to match .tool-versions
36+
RUN pip install poetry==1.3.2
3637
# install py_cubic_ingestion's required python dependencies
3738
COPY ./py_cubic_ingestion /data_platform/py_cubic_ingestion
3839
WORKDIR /data_platform/py_cubic_ingestion

py_cubic_ingestion/pyproject.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ packages = [
99
]
1010

1111
[tool.poetry.dependencies]
12-
python = "3.7.12"
12+
### Note: This version here needs to match .tool-versions
13+
python = "3.7.17"
1314
python-dateutil = "^2.8.2"
1415
boto3-stubs = {extras = ["glue"], version = "^1.24.23"}
1516

0 commit comments

Comments
 (0)