Skip to content

Commit d8e7a5c

Browse files
authored
chore: upgrade setuptools & pin cmake (#3152)
* fix: update setuptools in layers * use cmake<4 * add comment * clarify comment * clarify comment
1 parent fa21733 commit d8e7a5c

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

building/lambda/Dockerfile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,14 @@ RUN ln -s /usr/bin/gcc10-ld /usr/bin/ld
3434
FROM ${python_version}
3535
COPY pyproject.toml poetry.lock ./
3636

37-
RUN pip3 install --upgrade pip wheel setuptools>=64 setuptools_scm>=8
37+
# Setuptools is a build dependency of arrow and runtime dependency of some of our dependencies (mainly redshift-connector).
38+
# Remove when arrow version shipped with lambda layers and dependencies are updated.
39+
RUN pip3 install --upgrade pip wheel setuptools>=78.1.1 setuptools_scm>=8
3840
RUN pip3 install --upgrade urllib3==1.26.16 # temporary to avoid https://github.com/urllib3/urllib3/issues/2168 (TODO remove when the AL2 image updates to support OpenSSL 1.1.1+)
39-
RUN pip3 install --upgrade six cython cmake hypothesis poetry
41+
# In new CMake 4, compatibility with CMake < 3.5 has been removed.
42+
# Unpin CMake when arrow version shipped with lambda layers is updated.
43+
RUN pip3 install --upgrade cmake==3.31.6
44+
RUN pip3 install --upgrade six cython hypothesis poetry
4045
ENV PIP_NO_BINARY="numpy,pandas"
4146
RUN poetry config virtualenvs.create false --local && poetry install --no-root --only main
4247

building/lambda/Dockerfile.al2023

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,14 @@ WORKDIR /root
2323
FROM ${python_version}
2424
COPY pyproject.toml poetry.lock ./
2525

26-
RUN pip3 install --upgrade pip wheel setuptools>=64 setuptools_scm>=8
27-
RUN pip3 install --upgrade six cython cmake hypothesis poetry
26+
# Setuptools is a build dependency of arrow and runtime dependency of some of our dependencies (mainly redshift-connector).
27+
# Remove when arrow version shipped with lambda layers and dependencies are updated.
28+
RUN pip3 install --upgrade pip wheel setuptools>=78.1.1 setuptools_scm>=8
29+
# In new CMake 4, compatibility with CMake < 3.5 has been removed.
30+
# Unpin CMake when arrow version shipped with lambda layers is updated.
31+
RUN pip3 install --upgrade cmake==3.31.6
32+
RUN pip3 install --upgrade six cython hypothesis poetry
33+
2834
ENV PIP_NO_BINARY="numpy,pandas"
2935
RUN poetry config virtualenvs.create false --local && poetry install --no-root --only main
3036

0 commit comments

Comments
 (0)