From b4198bd102b50d2f885e300d54df092930e6e187 Mon Sep 17 00:00:00 2001 From: Peter Ebden Date: Sat, 29 Aug 2026 08:35:23 +0100 Subject: [PATCH 1/3] Update some Python libraries --- third_party/python/BUILD | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/third_party/python/BUILD b/third_party/python/BUILD index 2e85c368d6..675bffa1c3 100644 --- a/third_party/python/BUILD +++ b/third_party/python/BUILD @@ -14,8 +14,8 @@ package( python_wheel( name = "six", outs = ["six.py"], - hashes = ["8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"], - version = "1.16.0", + hashes = ["4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274"], + version = "1.17.0", ) python_wheel( @@ -34,8 +34,8 @@ python_wheel( python_wheel( name = "certifi", - hashes = ["017c25db2a153ce562900032d5bc68e9f191e44e9a0f762f373977de9df1fbb3"], - version = "2019.11.28", + hashes = ["62f22742b58a1a33014a2b6b706588a8d7e2a88ae7bd1a6ebe8c992928483775"], + version = "2026.7.22", ) python_wheel( @@ -52,8 +52,8 @@ python_wheel( python_wheel( name = "urllib3", - hashes = ["a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472"], - version = "2.2.2", + hashes = ["9fb4c81ebbb1ce9531cce37674bbc6f1360472bc18ca9a553ede278ef7276897"], + version = "2.7.0", ) python_wheel( @@ -65,12 +65,14 @@ python_wheel( python_wheel( name = "absl", package_name = "absl_py", - hashes = ["c106f6ef0ae86c1273b0858b40ee15b99fad1c223838387b9d11446a033bbcb1"], - version = "0.9.0", + hashes = ["0f17b89f2a4eaaedc4f28c622998aa690564b3012a396a4ffad0821007fe03ba"], + version = "2.5.0", deps = [":six"], ) pip_library( name = "progress", - version = "1.5", + version = "1.6.1", + licences = ["ISC"], + hashes = ["34ce5c7402e39aa9b88b988bc8559bd35b22c589d18b480251c7c72e15eba944"], ) From ace293d27290270cdea4ffa804af4c1b295fe1b9 Mon Sep 17 00:00:00 2001 From: Peter Ebden Date: Sat, 29 Aug 2026 08:47:12 +0100 Subject: [PATCH 2/3] remove hash since it's a pip_library I guess --- third_party/python/BUILD | 1 - 1 file changed, 1 deletion(-) diff --git a/third_party/python/BUILD b/third_party/python/BUILD index 675bffa1c3..5e57d4d8b6 100644 --- a/third_party/python/BUILD +++ b/third_party/python/BUILD @@ -74,5 +74,4 @@ pip_library( name = "progress", version = "1.6.1", licences = ["ISC"], - hashes = ["34ce5c7402e39aa9b88b988bc8559bd35b22c589d18b480251c7c72e15eba944"], ) From 24df4bd0066746023b45dddb3f318ec0e92f2d30 Mon Sep 17 00:00:00 2001 From: Peter Ebden Date: Sat, 24 Oct 2026 11:00:02 +0100 Subject: [PATCH 3/3] Install a not totally ancient version of Python on macos --- .circleci/config.yml | 4 ++-- .circleci/setup_osx.sh | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ec7048a8c9..6c5f89510f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -243,7 +243,7 @@ jobs: - restore_cache: key: go-darwin-arm64-go123-v1-{{ checksum "third_party/go/BUILD" }} - restore_cache: - key: python-darwin-arm64-v3-{{ checksum "third_party/python/BUILD" }} + key: python-darwin-arm64-v4-{{ checksum "third_party/python/BUILD" }} - restore_cache: key: e2e-darwin-arm64-v1-{{ checksum "/tmp/e2e-cache-key" }} - run: @@ -282,7 +282,7 @@ jobs: key: go-darwin-arm64-go123-v1-{{ checksum "third_party/go/BUILD" }} paths: [ ".plz-cache/third_party/go" ] - save_cache: - key: python-darwin-arm64-v3-{{ checksum "third_party/python/BUILD" }} + key: python-darwin-arm64-v4-{{ checksum "third_party/python/BUILD" }} paths: [ ".plz-cache/third_party/python" ] - save_cache: key: e2e-darwin-arm64-v1-{{ checksum "/tmp/e2e-cache-key" }} diff --git a/.circleci/setup_osx.sh b/.circleci/setup_osx.sh index 88338397b3..969a3bdc7a 100755 --- a/.circleci/setup_osx.sh +++ b/.circleci/setup_osx.sh @@ -13,3 +13,10 @@ if ! command -v xz &> /dev/null; then brew install xz fi sudo ln -s /opt/homebrew/bin/xz /usr/local/bin/xz + +# /usr/bin/python3 is Xcode's bundled Python, which is too old for some of our deps. +# Put a newer one in /usr/local/bin, which precedes /usr/bin on plz's default path. +if [ ! -x "/opt/homebrew/opt/python@3.13/bin/python3.13" ]; then + brew install python@3.13 +fi +sudo ln -sf /opt/homebrew/opt/python@3.13/bin/python3.13 /usr/local/bin/python3