From d5ac9d3332c2ca99b88c7c11cf62b4e2714c5490 Mon Sep 17 00:00:00 2001 From: mayankmendix <60148863+mayankmendix@users.noreply.github.com> Date: Fri, 29 May 2026 19:19:59 +0530 Subject: [PATCH 1/5] Release 2026-05-29 (#899) Merged Develop to Master - Fix: Added typing-extensions==4.15.0 as an explicit dependency --- requirements.in | 1 + requirements.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements.in b/requirements.in index cf0cbf2f..7b668abe 100644 --- a/requirements.in +++ b/requirements.in @@ -8,4 +8,5 @@ omegaconf==2.3.0 psycopg2-binary==2.9.10 pyyaml==6.0.2 requests==2.34.2 +typing-extensions==4.15.0 urllib3==2.7.0 diff --git a/requirements.txt b/requirements.txt index 6f4af638..84236d78 100644 --- a/requirements.txt +++ b/requirements.txt @@ -43,7 +43,7 @@ pyyaml==6.0.2 requests==2.34.2 # via -r requirements.in typing-extensions==4.15.0 - # via cryptography + # via -r requirements.in urllib3==2.7.0 # via # -r requirements.in From a0db18c333dcce64744adb935ace48487fcc5ab5 Mon Sep 17 00:00:00 2001 From: Archit Date: Fri, 10 Jul 2026 20:29:32 +0530 Subject: [PATCH 2/5] Fix dev Docker image package installation --- dev/Dockerfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dev/Dockerfile b/dev/Dockerfile index e1c1e390..92dfe650 100644 --- a/dev/Dockerfile +++ b/dev/Dockerfile @@ -7,10 +7,12 @@ COPY ./requirements-dev.in ./ COPY ./Makefile ./ RUN make install_requirements - -RUN wget -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key | apt-key add - \ - && echo "deb https://packages.cloudfoundry.org/debian stable main" | tee /etc/apt/sources.list.d/cloudfoundry-cli.list \ + +RUN apt-get update \ + && apt-get install -y wget gnupg \ + && wget -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key | gpg --dearmor -o /usr/share/keyrings/cloudfoundry.gpg \ + && echo "deb [signed-by=/usr/share/keyrings/cloudfoundry.gpg] https://packages.cloudfoundry.org/debian stable main" | tee /etc/apt/sources.list.d/cloudfoundry-cli.list \ && apt-get update \ - && apt-get install -y cf-cli docker zip + && apt-get install -y cf-cli docker.io zip RUN cf install-plugin -f cflocal From cc7fb071b4b0aee35bda711111da108a5c7f2896 Mon Sep 17 00:00:00 2001 From: Archit Date: Fri, 10 Jul 2026 23:47:15 +0530 Subject: [PATCH 3/5] Upgrade httplib2 to 0.32.0 to fix CVE-2026-59939 --- requirements.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.in b/requirements.in index 57a36931..9369339f 100644 --- a/requirements.in +++ b/requirements.in @@ -2,7 +2,7 @@ backoff==2.2.1 certifi==2024.8.30 cryptography==48.0.1 distro==1.9.0 -httplib2==0.22.0 +httplib2>=0.32.0 idna==3.15 jinja2==3.1.6 omegaconf==2.3.0 From dc3a26596e6453ab377b1c705f0ee4de6ebd4bfc Mon Sep 17 00:00:00 2001 From: Archit Date: Fri, 10 Jul 2026 23:54:29 +0530 Subject: [PATCH 4/5] Update dev Dockerfile --- dev/Dockerfile | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dev/Dockerfile b/dev/Dockerfile index 92dfe650..e694e47b 100644 --- a/dev/Dockerfile +++ b/dev/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=linux/amd64 python:3.10 +FROM --platform=linux/amd64 python:3.10-slim WORKDIR /app @@ -6,13 +6,17 @@ COPY ./requirements.in ./ COPY ./requirements-dev.in ./ COPY ./Makefile ./ -RUN make install_requirements - RUN apt-get update \ - && apt-get install -y wget gnupg \ + && apt-get upgrade -y \ + && apt-get install -y make wget gnupg ca-certificates curl \ + && make install_requirements \ + && install -m 0755 -d /etc/apt/keyrings \ + && curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg \ + && chmod a+r /etc/apt/keyrings/docker.gpg \ + && echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian bookworm stable" > /etc/apt/sources.list.d/docker.list \ && wget -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key | gpg --dearmor -o /usr/share/keyrings/cloudfoundry.gpg \ && echo "deb [signed-by=/usr/share/keyrings/cloudfoundry.gpg] https://packages.cloudfoundry.org/debian stable main" | tee /etc/apt/sources.list.d/cloudfoundry-cli.list \ && apt-get update \ - && apt-get install -y cf-cli docker.io zip + && apt-get install -y cf-cli docker-ce-cli zip -RUN cf install-plugin -f cflocal +RUN cf install-plugin -f cflocal \ No newline at end of file From b2a493bf19797904c6a7287c129915dd29b862ea Mon Sep 17 00:00:00 2001 From: Archit Date: Sat, 11 Jul 2026 00:27:03 +0530 Subject: [PATCH 5/5] Regenerate requirements.txt after httplib2 upgrade --- requirements.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 8e348363..f1eb0d1d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.10 # by the following command: # -# pip-compile --cert=None --client-cert=None --index-url=None --pip-args=None --strip-extras requirements.in +# pip-compile --strip-extras requirements.in # antlr4-python3-runtime==4.9.3 # via omegaconf @@ -20,7 +20,7 @@ cryptography==48.0.1 # via -r requirements.in distro==1.9.0 # via -r requirements.in -httplib2==0.22.0 +httplib2==0.32.0 # via -r requirements.in idna==3.15 # via @@ -36,7 +36,7 @@ psycopg2-binary==2.9.10 # via -r requirements.in pycparser==2.20 # via cffi -pyparsing==2.4.7 +pyparsing==3.3.2 # via httplib2 pyyaml==6.0.2 # via @@ -45,7 +45,9 @@ pyyaml==6.0.2 requests==2.34.2 # via -r requirements.in typing-extensions==4.15.0 - # via -r requirements.in + # via + # -r requirements.in + # cryptography urllib3==2.7.0 # via # -r requirements.in