Skip to content

Commit

Permalink
Merge branch 'main' into automated-update-for-image-history-12305169714
Browse files Browse the repository at this point in the history
  • Loading branch information
ddoyle2017 authored Dec 16, 2024
2 parents 7be23f3 + 46b9295 commit 77a754e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/python/.devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
# Temporary: Upgrade python packages due to https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-40897 and https://github.com/advisories/GHSA-2mqj-m65w-jghx
# They are installed by the base image (python) which does not have the patch.
RUN python3 -m pip install --upgrade \
setuptools==69.0.3 \
setuptools==75.6.0 \
gitpython==3.1.41

# [Optional] If your pip requirements rarely change, uncomment this section to add them to the image.
Expand Down
2 changes: 1 addition & 1 deletion src/python/test-project/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ check "gitconfig-contains-name" sh -c "cat /etc/gitconfig | grep 'name = devcont
check "usr-local-etc-config-does-not-exist" test ! -f "/usr/local/etc/gitconfig"

setuptools_version=$(python -c "import setuptools; print(setuptools.__version__)")
check-version-ge "setuptools-requirement" "${setuptools_version}" "65.5.1"
check-version-ge "setuptools-requirement" "${setuptools_version}" "75.6.0"

# https://github.com/advisories/GHSA-2mqj-m65w-jghx
gitpython_version=$(python -c "import git; print(git.__version__)")
Expand Down

0 comments on commit 77a754e

Please sign in to comment.