Skip to content

Commit 57f2fbd

Browse files
committed
pin setuptools version to 75.2.0
1 parent 8345735 commit 57f2fbd

File tree

2 files changed

+15
-11
lines changed

2 files changed

+15
-11
lines changed

Dockerfile

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,7 @@ ADD aws-opentelemetry-distro/ ./aws-opentelemetry-distro/
1818
# * https://github.com/MicrosoftDocs/azure-docs/blob/main/articles/azure-functions/recover-python-functions.md#troubleshoot-cannot-import-cygrpc
1919
RUN sed -i "/opentelemetry-exporter-otlp-proto-grpc/d" ./aws-opentelemetry-distro/pyproject.toml
2020

21-
# urllib3 recently made a release that drops support for Python 3.8
22-
# Our sdk depends on botocore which pulls in the version of urllib3 based Python runtime it detects.
23-
# The rule is that if current pip command version is > 3.9 botocore will pick up the latest urllib3,
24-
# otherwise it picks up the older urllib3 that is compatible with Python 3.8.
25-
# https://github.com/boto/botocore/blob/develop/requirements-docs.txt
26-
# Since this Dockerfile currently uses the fixed Python 3.11 base image to pull the required dependencies,
27-
# EKS and ECS applications will encounter a runtime error for Python 3.8 compatibility.
28-
# Our fix is to temporarily restrict the urllib3 version to one that works for all supported Python versions
29-
# that we currently commit to support (notably 3.8).
30-
# TODO: Remove this temporary workaround once we deprecate Python 3.8 support since it has reached end-of-life.
31-
RUN mkdir workspace && pip install urllib3==2.2.3 --target workspace ./aws-opentelemetry-distro
21+
RUN mkdir workspace && pip install --target workspace ./aws-opentelemetry-distro
3222

3323
# Stage 2: Build the cp-utility binary
3424
FROM public.ecr.aws/docker/library/rust:1.81 as builder

aws-opentelemetry-distro/pyproject.toml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,20 @@ dependencies = [
8080
"opentelemetry-instrumentation-urllib3 == 0.48b0",
8181
"opentelemetry-instrumentation-wsgi == 0.48b0",
8282
"opentelemetry-instrumentation-cassandra == 0.48b0",
83+
# urllib3 recently made a release that drops support for Python 3.8
84+
# Our sdk depends on botocore which pulls in the version of urllib3 based Python runtime it detects.
85+
# The rule is that if current pip command version is > 3.9 botocore will pick up the latest urllib3,
86+
# otherwise it picks up the older urllib3 that is compatible with Python 3.8.
87+
# https://github.com/boto/botocore/blob/develop/requirements-docs.txt
88+
# Since this Dockerfile currently uses the fixed Python 3.11 base image to pull the required dependencies,
89+
# EKS and ECS applications will encounter a runtime error for Python 3.8 compatibility.
90+
# Our fix is to temporarily restrict the urllib3 version to one that works for all supported Python versions
91+
# that we currently commit to support (notably 3.8).
92+
# We also pin the setuptools version for similar issues with the library dropping 3.8 support.
93+
# https://github.com/pypa/setuptools/blame/main/pkg_resources/__init__.py#L24
94+
# TODO: Remove these temporary workarounds once we deprecate Python 3.8 support since it has reached end-of-life.
95+
"urllib3 == 2.2.3",
96+
"setuptools == 75.2.0",
8397
]
8498

8599
[project.optional-dependencies]

0 commit comments

Comments
 (0)