From b9cbc77b82ca3820ea7c0f4ba5a9359d525ddd54 Mon Sep 17 00:00:00 2001 From: Daniel Mil <84205762+mildaniel@users.noreply.github.com> Date: Thu, 20 Jul 2023 17:22:46 -0700 Subject: [PATCH] chore: Revert cython patch (#100) --- build-image-src/Dockerfile-python310 | 2 -- build-image-src/Dockerfile-python311 | 2 -- 2 files changed, 4 deletions(-) diff --git a/build-image-src/Dockerfile-python310 b/build-image-src/Dockerfile-python310 index a9d7206..3517da8 100644 --- a/build-image-src/Dockerfile-python310 +++ b/build-image-src/Dockerfile-python310 @@ -27,11 +27,9 @@ ARG AWS_CLI_ARCH RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-$AWS_CLI_ARCH.zip" -o "awscliv2.zip" && unzip awscliv2.zip && ./aws/install && rm awscliv2.zip && rm -rf ./aws # Install SAM CLI in a dedicated Python virtualenv -# Note: Remove cython<3.0.0 line once the issue with building pyyaml from source is fixed ARG SAM_CLI_VERSION RUN curl -L "https://github.com/awslabs/aws-sam-cli/archive/v$SAM_CLI_VERSION.zip" -o "samcli.zip" && \ unzip samcli.zip && python3 -m venv /usr/local/opt/sam-cli && \ - /usr/local/opt/sam-cli/bin/pip3 install wheel && /usr/local/opt/sam-cli/bin/pip3 install --no-build-isolation "cython<3.0.0" pyyaml==5.4.1 && /usr/local/opt/sam-cli/bin/pip3 uninstall wheel cython --yes && \ /usr/local/opt/sam-cli/bin/pip3 --no-cache-dir install -r ./aws-sam-cli-$SAM_CLI_VERSION/requirements/base.txt && \ /usr/local/opt/sam-cli/bin/pip3 --no-cache-dir install ./aws-sam-cli-$SAM_CLI_VERSION && \ rm samcli.zip && rm -rf aws-sam-cli-$SAM_CLI_VERSION diff --git a/build-image-src/Dockerfile-python311 b/build-image-src/Dockerfile-python311 index 98ea139..1fe62ac 100644 --- a/build-image-src/Dockerfile-python311 +++ b/build-image-src/Dockerfile-python311 @@ -27,11 +27,9 @@ ARG AWS_CLI_ARCH RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-$AWS_CLI_ARCH.zip" -o "awscliv2.zip" && unzip awscliv2.zip && ./aws/install && rm awscliv2.zip && rm -rf ./aws # Install SAM CLI in a dedicated Python virtualenv -# Note: Remove cython<3.0.0 line once the issue with building pyyaml from source is fixed ARG SAM_CLI_VERSION RUN curl -L "https://github.com/awslabs/aws-sam-cli/archive/v$SAM_CLI_VERSION.zip" -o "samcli.zip" && \ unzip samcli.zip && python3 -m venv /usr/local/opt/sam-cli && \ - /usr/local/opt/sam-cli/bin/pip3 install wheel && /usr/local/opt/sam-cli/bin/pip3 install "cython<3.0.0" pyyaml==5.4.1 --no-build-isolation && /usr/local/opt/sam-cli/bin/pip3 uninstall wheel cython --yes && \ /usr/local/opt/sam-cli/bin/pip3 --no-cache-dir install -r ./aws-sam-cli-$SAM_CLI_VERSION/requirements/base.txt && \ /usr/local/opt/sam-cli/bin/pip3 --no-cache-dir install ./aws-sam-cli-$SAM_CLI_VERSION && \ rm samcli.zip && rm -rf aws-sam-cli-$SAM_CLI_VERSION