Merge branch 'main' into add-dynamic-to-database-for-metadata-2.2

.github/workflows/ci.yml

@@ -47,7 +47,7 @@ jobs:
       matrix:
         include:
           - name: Tests
-            command: bin/tests
+            command: bin/tests --postgresql-host localhost
           - name: Lint
             command: bin/lint
           - name: User Documentation
@@ -62,6 +62,14 @@ jobs:
             command: bin/translations
     runs-on: ubuntu-latest
     services:
+      postgres:
+        image: ${{ (matrix.name == 'Tests') && 'postgres:14.4' || '' }}
+        ports:
+          - 5432:5432
+        env:
+          POSTGRES_HOST_AUTH_METHOD: trust  # never do this in production!
+        # Set health checks to wait until postgres has started
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
       stripe:
         image: ${{ (matrix.name == 'Tests') && 'stripe/stripe-mock:v0.162.0' || '' }}
         ports:

.python-version

@@ -1 +1 @@
-3.11.7
+3.11.8

Dockerfile

@@ -36,7 +36,7 @@ RUN NODE_ENV=production npm run build
 
 
 # We'll build a light-weight layer along the way with just docs stuff
-FROM python:3.11.7-slim-bookworm as docs
+FROM python:3.11.8-slim-bookworm as docs
 
 # By default, Docker has special steps to avoid keeping APT caches in the layers, which
 # is good, but in our case, we're going to mount a special cache volume (kept between
@@ -105,7 +105,7 @@ USER docs
 
 # Now we're going to build our actual application, but not the actual production
 # image that it gets deployed into.
-FROM python:3.11.7-slim-bookworm as build
+FROM python:3.11.8-slim-bookworm as build
 
 # Define whether we're building a production or a development image. This will
 # generally be used to control whether or not we install our development and
@@ -184,7 +184,7 @@ RUN --mount=type=cache,target=/root/.cache/pip \
 
 # Now we're going to build our actual application image, which will eventually
 # pull in the static files that were built above.
-FROM python:3.11.7-slim-bookworm
+FROM python:3.11.8-slim-bookworm
 
 # Setup some basic environment variables that are ~never going to change.
 ENV PYTHONUNBUFFERED 1
@@ -212,7 +212,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     && apt-get update \
     && apt-get install --no-install-recommends -y \
         libpq5 libxml2 libxslt1.1 libcurl4  \
-        $(if [ "$DEVEL" = "yes" ]; then echo 'bash libjpeg62 postgresql-client postgresql build-essential libffi-dev libxml2-dev libxslt-dev libpq-dev libcurl4-openssl-dev libssl-dev vim'; fi) \
+        $(if [ "$DEVEL" = "yes" ]; then echo 'bash libjpeg62 postgresql-client build-essential libffi-dev libxml2-dev libxslt-dev libpq-dev libcurl4-openssl-dev libssl-dev vim'; fi) \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
@@ -224,6 +224,3 @@ COPY --from=static /opt/warehouse/src/warehouse/static/dist/ /opt/warehouse/src/
 COPY --from=static /opt/warehouse/src/warehouse/admin/static/dist/ /opt/warehouse/src/warehouse/admin/static/dist/
 COPY --from=build /opt/warehouse/ /opt/warehouse/
 COPY . /opt/warehouse/src/
-
-# We cannot run `postgres` as root, so add a user to run the application
-USER nobody

Makefile

@@ -61,7 +61,7 @@ debug: .state/docker-build-base
 	docker compose run --rm --service-ports web
 
 tests: .state/docker-build-base
-	docker compose run --rm tests bin/tests $(T) $(TESTARGS)
+	docker compose run --rm tests bin/tests --postgresql-host db $(T) $(TESTARGS)
 
 static_tests: .state/docker-build-static
 	docker compose run --rm static bin/static_tests $(T) $(TESTARGS)

bin/lint

@@ -13,7 +13,7 @@ set -x
 # Actually run our tests.
 find . -name '*.py' -exec python -m pyupgrade --py311-plus {} +
 python -m flake8 .
-python -m black --check *.py warehouse/ tests/
+python -m black --check --diff *.py warehouse/ tests/
 python -m isort --check *.py warehouse/ tests/
 python -m doc8 --allow-long-titles README.rst CONTRIBUTING.rst docs/ --ignore-path "docs/**/_build/"
 python -m curlylint ./warehouse/templates ./docs/blog

bin/tests

@@ -1,10 +1,42 @@
 #!/bin/bash
-set -ex
+set -e
+
+# Click requires us to ensure we have a well configured environment to run
+# our click commands. So we'll set our environment to ensure our locale is
+# correct.
+export LC_ALL="${ENCODING:-en_US.UTF-8}"
+export LANG="${ENCODING:-en_US.UTF-8}"
+
+COMMAND_ARGS="$@"
+
+# Test the postgres connection
+while [ $# -gt 0 ]; do
+  case $1 in
+    "--postgresql-host") POSTGRES_HOST="$2"
+  esac
+  shift
+done
+
+# Test the postgres connection
+ATTEMPTS=0
+until [ $ATTEMPTS -eq 5 ] || pg_isready -t 10 -h $POSTGRES_HOST; do
+  >&2 echo "Postgres is unavailable, sleeping"
+  sleep $(( ATTEMPTS++ ))
+done
+
+if [ $ATTEMPTS -eq 5 ]; then
+  >&2 echo "Postgres is unavailable, exiting"
+  exit 1
+fi
+
+# Print all the following commands
+set -x
 
 # Create any dist directories to silence whitenoise warnings.
-mkdir -p warehouse/warehouse/admin/static/dist/
-mkdir -p warehouse/warehouse/static/dist/
+mkdir -p warehouse/admin/static/dist/
+mkdir -p warehouse/static/dist/
 
-python -m coverage run -m pytest --strict-markers "$@"
+# Actually run our tests.
+python -m coverage run -m pytest --strict-markers $COMMAND_ARGS
 python -m coverage html --show-contexts
 python -m coverage report -m --fail-under 100

docker-compose.yml

@@ -83,6 +83,7 @@ services:
       - ./warehouse:/opt/warehouse/src/warehouse:z
       - ./tests:/opt/warehouse/src/tests:z
       - ./htmlcov:/opt/warehouse/src/htmlcov:z
+      - ./setup.cfg:/opt/warehouse/src/setup.cfg:z
       - ./pyproject.toml:/opt/warehouse/src/pyproject.toml:z
       - packages:/var/opt/warehouse/packages
       - packages-archive:/var/opt/warehouse/packages-archive
@@ -118,6 +119,8 @@ services:
     pull_policy: never
     volumes: *base_volumes
     depends_on:
+      db:
+        condition: service_healthy
       stripe:
         condition: service_started
 

pyproject.toml

@@ -1,6 +1,5 @@
 [tool.coverage.run]
 branch = true
-data_file = "dev/.coverage"
 dynamic_context = "test_function"
 source = ["warehouse"]
 omit = [

requirements/deploy.in

@@ -1,2 +1,2 @@
 gunicorn==21.2.0
-ddtrace==2.5.2
+ddtrace==2.6.3

requirements/deploy.txt

@@ -22,67 +22,67 @@ ddsketch==2.0.4 \
     --hash=sha256:3227a270fd686a29d3a7128f9352ccf852314410380fc11384356f1ae2a75938 \
     --hash=sha256:32f7314077fec8747d4faebaec2c854b5ffc399c5f552f73fa94024f48d74d64
     # via ddtrace
-ddtrace==2.5.2 \
-    --hash=sha256:066403f0e00a8de09c8187037befe7463d1fab5d8178b62a07c2542792710d14 \
-    --hash=sha256:15d78b0cd5d2090c063031d76e933b8b24e043d524a6091a751cf57b0fab025f \
-    --hash=sha256:1e59f3958016fcec5eb16abd7979a9ec4d850733e2a03b878b096277fc092784 \
-    --hash=sha256:20f1cb3bea1170410d603f9d557918c24d4d8783659c03817daea6352d9f37f9 \
-    --hash=sha256:227bb0391d310e0d5a54505c7ab59f9692a5db91dc492373489bc45726980e1d \
-    --hash=sha256:30186112f156a564efda5e2018240b55baee7664897ca5fc35c452d032a77185 \
-    --hash=sha256:37b4d55a5be59530e6e5761a36d727aee812be69c81b00ee0182eb62be6f3b75 \
-    --hash=sha256:38cbcb7b4ff1371480b29228d2b8e570e7d7b386a7632b96f9600135ec3eb9db \
-    --hash=sha256:3aa2543c2303ab325af7794f2a8a420133cd9222e70bfbce3869da146fc5e2ba \
-    --hash=sha256:3f4eed40d978352c7371804ecb68bbe9e55967bb904bd03b0568554e0b6b92cf \
-    --hash=sha256:3ff039635470ba483ed448baaf6337d85a731b17af62fef06dfa811f761f374f \
-    --hash=sha256:49aa4e0210862e829e09569de2e2f34ac17c5e246567c5b6662ec21e2a06d938 \
-    --hash=sha256:4c54bc474c70151d5a141061b6c20a1efabdf458e4239c790d45fa12a13b8e7d \
-    --hash=sha256:4d9e7a9e26c38ae1e368f5d820e78459ff2d39689f40d4a3db185ddb3686c383 \
-    --hash=sha256:4df564e620ec7e657fcdb0d5bf1231aa1357bf49b736f0d9e9f6df17a23fc569 \
-    --hash=sha256:512d3975b1657c706ca9c84373e5fce323f6fc94bfac33c30876ad8d55e0ea71 \
-    --hash=sha256:57606af5380888e2e7cc67b7c4fa5e1bc51d29c48f004b4be0cbe1b319fddc75 \
-    --hash=sha256:5aafd86eeea622cd0e8cf6b63632efc67a52a32317d2a376382ef6170d383c9f \
-    --hash=sha256:5addeb19eea5ebdc23c493e5635f4c8737795b48ba637117a1895f31b900985f \
-    --hash=sha256:5d3f1bc3ce87fbcf2256197178179ef681df720ebbc39b0559bda00247744533 \
-    --hash=sha256:62e775ba9d2a2b5f952a6609029e965057bdd852ccd6e53b55c0f82ae83aa542 \
-    --hash=sha256:637f16af1c84566bde044798312c67bc5676df949632ab02e740440558f2a598 \
-    --hash=sha256:6bdfae9fa03af334820678196a4895450d0b6bd9f1b5119d42ddbd327a55fcce \
-    --hash=sha256:6c61e72abec3f2f6b46e53712a32a971de1b6a9be657d5ebeff1334f6146babc \
-    --hash=sha256:6d97f990d2322a23e82203cc5a2aa694fb0d42541a44bb120390e6598a63e5f5 \
-    --hash=sha256:6e55c4738b58b4452933204305243e19000f6f283af93bf51b63382100cb8f21 \
-    --hash=sha256:72d21fe6842a8d80c8765dd699153a2475ae2d49e82e10f9668eadb08b454040 \
-    --hash=sha256:7351500241eb24c7d789b371a6860ca2b0e2db1ff9d317089153b562a3a461e1 \
-    --hash=sha256:8814321822e4afc95ac86fbc476dc20d78dd4b1d510c02606459df4580093d18 \
-    --hash=sha256:8840f0e82d6dca3888bd06e7ab0ca6d39009f3cd3475028d8bc03c939127afc2 \
-    --hash=sha256:8f4b67e02ba5c316711719dcfc15e94f47684e7af1785289d016a29a2c664827 \
-    --hash=sha256:96a791f03b62ebdb9f3e635a0e93711149123a8fc1c1c152be0d1cdb5d8e6359 \
-    --hash=sha256:985738fe875b11f05dfa2b1f21a619d499344eb740f63e01d6eae1fb29eb949b \
-    --hash=sha256:9bbd675d73aae6516e02a86cb830778771dafb0e182d5a122270ccd82ee77eed \
-    --hash=sha256:9eaca41664dd0c2bd7257fe2e91c7e46718b20591bfaa0b5c01c39b599115f88 \
-    --hash=sha256:a270d128c6067f52a76ecbb658fae3f4d3bd4888baa9e6159ff82b6de14c53be \
-    --hash=sha256:a2cfc6ee800890556e404b94d13680c83952efa5d3dafa72ef8cb08a8782f874 \
-    --hash=sha256:a34ccab0c8991c5fc5252d5cd6e88852cd7f77c8bf838de84e70b4a3bfacaad4 \
-    --hash=sha256:a50057085b0972e695bb1ef3042f6cd6a1a3b12111fac4985942f2dbbcf8ac2f \
-    --hash=sha256:a6e48caf63506d7ac3df7caa955b6258de91c1a1f55149506ab8ac36143770b9 \
-    --hash=sha256:aa2e64f79ada9f2fd5307cd0eba726d8585e47b0282fb9463aaa4b267265e94a \
-    --hash=sha256:aa596f2e80c525a2310e605bfa3fa6ba6790b2ae90c02e47ceee0e62ceae17a6 \
-    --hash=sha256:ad6c0ae7baff9d00c689834aec0627274d681ed1d2a8ae627348a6191e8d32ec \
-    --hash=sha256:b5fb2bbd38dc46ba6a7ea1031c4751b1ca888be5fac8a42049ebc2517707c00d \
-    --hash=sha256:b923b099b9a1e50f01ce8bcd4d11e3255a48c71f3e6314dd9a482baed0a87ed6 \
-    --hash=sha256:b93d8b536f5fc45a72bb2785051dc729f4d581ef2d69ed10bccae6a7487477b2 \
-    --hash=sha256:c361ea11b442b04d8e011528205ed65b926d71d18f38d372270204eabf49b068 \
-    --hash=sha256:caa6fb6bcfb3810d8f0882e489e7d2ef4dd3a92b452cfdd8d1fd4703dc496b17 \
-    --hash=sha256:cbbcbf24bca8497f1412ec438fbdc94847aef9e86092ffd4f8626bbe6d278d33 \
-    --hash=sha256:d24841a9390f3e169edcaf1ca5ac80599062e66dee43a510decb25e779b6f7b4 \
-    --hash=sha256:d34f8da809e2783770a6c88396b3653fb12a4196e9b5f16b8c10f37bbf2b7b31 \
-    --hash=sha256:dc3f26e04ba7521f6885d871fd6266fedc0a7ccf2637b85579c058927404bad7 \
-    --hash=sha256:e93f3f5d3d57beb492b04286c758be65495908bd313df6f56865ad7af222e49e \
-    --hash=sha256:ea2740a3d61876cb07b271af444e98cdc8b730497cfcddbc3794c7a7441b8d15 \
-    --hash=sha256:ee76beaf87695f2204b0c2c2a3664b39f3483b7a8447b28e5e2bcc899861b3eb \
-    --hash=sha256:ee8d0259a004964a8eddb394aa84a5754435d4270cd2041e6559c9e68fa49141 \
-    --hash=sha256:f56735eb636d3ab2f7224f261d3a6bd43f884e9901d68407d485ea65f3dc0f46 \
-    --hash=sha256:f918538a6adb33696be653d343ee318b16ea977376d9b7214d14fe97c42e9bd9 \
-    --hash=sha256:f9dccdc69de364cffc2b892280724c78cb54db151452a0b6d1b4a89b6f060c44 \
-    --hash=sha256:ffa4f5779c7000fe5960156bd15339184355b30a661b0955799cae50da5d03a7
+ddtrace==2.6.3 \
+    --hash=sha256:04f9cf8220e84b201c95502427587073f67138c3b14bd5228ef78d1903e2ed8e \
+    --hash=sha256:09fc377dab883dd3754e45df21b634e7f5893127032fc16982739160278daf68 \
+    --hash=sha256:1b8bb148ffe3b1b898abc14e55ce0b547c5fd3c4522ce261c4d15dcb4d68ce6f \
+    --hash=sha256:1be3b277b84dff4467ea9b89fea59495660970d69f5bda8c696df4e99af363e8 \
+    --hash=sha256:2365bcec468fe502be61e1d5a8b7215330f18e86a3a246fc711ddf002e6ecdf4 \
+    --hash=sha256:24f302c04eaf4e4b06ca62702abacbbf9652b7c3a4222e505d5395212c6fd61a \
+    --hash=sha256:300502b48fbf8691973a8f61aea95b7b9e101fd5dea9256e06a49e01360da734 \
+    --hash=sha256:339bd84b7884d284ec370805098996096082687313f72df11ad1fd871ac1b723 \
+    --hash=sha256:36a18604c308b0e26716fa44f43382e9ca8937f4d7b1f36b59816eb3e541f39f \
+    --hash=sha256:3b3b1b753e47a394917a094f7595570adbe8d30445c629f53fbc2276890dcd38 \
+    --hash=sha256:3b7951cee45be8464add1f53c07a8702d1b3ae21e33b893907fddfa316b51bab \
+    --hash=sha256:3fb44c3011b09d367d9e62927a8dec8efdc74065496aeca2d69d92b4368cde5c \
+    --hash=sha256:49555672d850ab0c694d368c40139694f4eef1adf2bd9baf71a0a69075c5a5f1 \
+    --hash=sha256:4adaf68614ce24af69c4a2665d929682b0e6d576997015b8e827ac400575b7cc \
+    --hash=sha256:4c0ead2a0643125d6ef96db14dca0a0769fd6fa371a54c017658d072cffb182c \
+    --hash=sha256:51705b1741865d9c963dbad19e4eb0ebb0831c02dead7ec804157bdc9c301f2e \
+    --hash=sha256:54b3c417fecc3c497d7a2050d61c32aee1fb3d33c7e103aa882f43ad0a24acdd \
+    --hash=sha256:5eb51bed0cef5b2ba3314d03c953616ec976ff74eff6e8d1ba957d34c14a315a \
+    --hash=sha256:6853fbd7edaa5ef8cf02c4d2976f643d500e102ea7961da291f9fdae6ec31926 \
+    --hash=sha256:698246e2cd18b08ac933faf20735aca1f0c9ffb86571cc53f99338b040005140 \
+    --hash=sha256:714f36545422f9811af5f8cf1e05cdffbf29f060afae81c80ee2804eaa861bd6 \
+    --hash=sha256:722aad4f5a25e5bcde47f38bd48db7f923a8c7708b3afc0ac16bf0da6a09c1d0 \
+    --hash=sha256:74d24fce87056d8340b7a53bd48113ed2885a1c847f72ec602e2dadaee3e3e7e \
+    --hash=sha256:75022e62cacbce5ac73e1830b809a43ecf3201839ad03ada3ffac394aae0ca29 \
+    --hash=sha256:7b37328bab299f177f1ef121d14588156189adbff48d43e46d46aec875e43dd3 \
+    --hash=sha256:7de9edf53b24bf299be41475e91e8d136873a51c7812f1ad581b4510085febea \
+    --hash=sha256:82e13ee088d4aeb6906408758b84f90eeb8246c6ed9cd3a410e2ba85c6a0c226 \
+    --hash=sha256:85945af14c22991f1040f18d221fd61a5a6224f755a726d553215b2864e58e6e \
+    --hash=sha256:86bbb8425984bc02e8401c9a9f16f69bebe7491f45d9d7910897c821591a1be9 \
+    --hash=sha256:872e12b3f228ae073bf5c7e2e8441887904467d51b9425650367feb5dbf42488 \
+    --hash=sha256:8aac6994fc4f91eb6d5b3d0899c0900cafe413068774e4add27f22825d243bc0 \
+    --hash=sha256:8f11f25ae5c89421e03eb00079b8d43aa436eb4c6f205b8313510090db58508b \
+    --hash=sha256:90255d30d577e5f76903a233a3b53ea231604c70f3f4cc712ab078a235435bfa \
+    --hash=sha256:91262d2fafaccb8147b551f53d67575ca41626f766d7579964026f69ffdcd375 \
+    --hash=sha256:920f1248002523395b12228c2ecb207854e4bc06729e607c1cd0b7b0dea1d932 \
+    --hash=sha256:96331a04a0a02e1df08757d21a7ad39f5d1bf1e648ec3b3572794847c667345f \
+    --hash=sha256:98bb1345508a2c6eb887e59859ef37e4b10f2482a6aa0b8fc2fb47a3cb49e265 \
+    --hash=sha256:9d56507551a60d8a2adee57ee0ce7b0ae041386585b7887ba42d63333ab6ff0c \
+    --hash=sha256:9da62b9f8b62633e99a543340c9048f8bd4cb91f24033f9f03f5129190c06dd0 \
+    --hash=sha256:9e6f197da7456c8c2ce8b0f13056b45d10e2e8aaa7a70037ac2f503884784e45 \
+    --hash=sha256:a43a8b16b0ab35aca2719269110b07f674e2de48f83cb0d6f96304da947dcb25 \
+    --hash=sha256:b16329070942672cc713dc44d1d2e7130d985b6630359c9cae007aa5dc29fce7 \
+    --hash=sha256:b50a39a8f75bf8b376fabee92348889b054d7f53035d812c25d32194269cf3aa \
+    --hash=sha256:bab18ff1dcd019f9413dcb709758a2455b3d98633d9579aa808cdb1f0d616c25 \
+    --hash=sha256:baeb997ca80af756087c014023f9c71bbd8d1e5f65607243de5735b1dc55671e \
+    --hash=sha256:bb932a46e978a32d591d53aabcc9ea5a4bd68206909d81a52c32349f2451d75a \
+    --hash=sha256:bfdec3f7496006b1c1845ba4cbbe9110829d17a111a480768271429c0ce632a1 \
+    --hash=sha256:c66b31ad1f24f23291bfa84a73e7a0750472f1d7b6ade4008f67c31292526324 \
+    --hash=sha256:cb2f6220feb8034dd4ccbc52337b7b2248d784a3da0317dd68a28ecc18517bc4 \
+    --hash=sha256:cc633b01f2add69d748aa23c01775e8fd31b72e087db8797c75c5b0c63bff915 \
+    --hash=sha256:d0924bbcd7b1d2734e05643e19bb03655dc893a6172cdccadaab2fd8634f902d \
+    --hash=sha256:d3a10eff219ac6b8d1b2e202d71579574aa50a76df9a4ce34376210d81e293ef \
+    --hash=sha256:d60f426f2589c87fd6628ae1b3761a4b2537b8c64b790915461f2328d2f8f77c \
+    --hash=sha256:d932b017321e2f1240edac6224d7d5e845397afbf3306aad79392ac26aaf96ee \
+    --hash=sha256:de606220b9f6efdb6b2e22e8915e5bbaeb98078b1b25cfcb6e4d7234be1808d4 \
+    --hash=sha256:e6b6ebb34352182e3128726aa81f46977186cf25c54ff40afb00f79cb7b9fe9f \
+    --hash=sha256:e7d7f86eb76842e4cab59415c96a17d4c0d64380da9978c7f750077c9229729d \
+    --hash=sha256:e9a172cd1932ac0d3dcf49e9dbd8b06256813f76f2400909caaa7e70c671be4d \
+    --hash=sha256:f5181fae5bb2bf66fbb11c0239052956f481a24d2be1330d60ab2c4849bafca3 \
+    --hash=sha256:fbaa1f20cabb688724e3cae8fc6087986bc7cea459773ca77b58c23b7ba31764
     # via -r requirements/deploy.in
 deprecated==1.2.14 \
     --hash=sha256:6fac8b097794a90302bdbb17b9b815e732d3c4720583ff1b198499d78470466c \
@@ -108,18 +108,18 @@ packaging==23.2 \
     --hash=sha256:048fb0e9405036518eaaf48a55953c750c11e1a1b68e0dd1a9d62ed0c092cfc5 \
     --hash=sha256:8c491190033a9af7e1d931d0b5dacc2ef47509b34dd0de67ed209b5203fc88c7
     # via gunicorn
-protobuf==4.25.2 \
-    --hash=sha256:10894a2885b7175d3984f2be8d9850712c57d5e7587a2410720af8be56cdaf62 \
-    --hash=sha256:2db9f8fa64fbdcdc93767d3cf81e0f2aef176284071507e3ede160811502fd3d \
-    --hash=sha256:33a1aeef4b1927431d1be780e87b641e322b88d654203a9e9d93f218ee359e61 \
-    --hash=sha256:47f3de503fe7c1245f6f03bea7e8d3ec11c6c4a2ea9ef910e3221c8a15516d62 \
-    --hash=sha256:5e5c933b4c30a988b52e0b7c02641760a5ba046edc5e43d3b94a74c9fc57c1b3 \
-    --hash=sha256:8f62574857ee1de9f770baf04dde4165e30b15ad97ba03ceac65f760ff018ac9 \
-    --hash=sha256:a8b7a98d4ce823303145bf3c1a8bdb0f2f4642a414b196f04ad9853ed0c8f830 \
-    --hash=sha256:b50c949608682b12efb0b2717f53256f03636af5f60ac0c1d900df6213910fd6 \
-    --hash=sha256:d66a769b8d687df9024f2985d5137a337f957a0916cf5464d1513eee96a63ff0 \
-    --hash=sha256:fc381d1dd0516343f1440019cedf08a7405f791cd49eef4ae1ea06520bc1c020 \
-    --hash=sha256:fe599e175cb347efc8ee524bcd4b902d11f7262c0e569ececcb89995c15f0a5e
+protobuf==4.25.3 \
+    --hash=sha256:19b270aeaa0099f16d3ca02628546b8baefe2955bbe23224aaf856134eccf1e4 \
+    --hash=sha256:209ba4cc916bab46f64e56b85b090607a676f66b473e6b762e6f1d9d591eb2e8 \
+    --hash=sha256:25b5d0b42fd000320bd7830b349e3b696435f3b329810427a6bcce6a5492cc5c \
+    --hash=sha256:7c8daa26095f82482307bc717364e7c13f4f1c99659be82890dcfc215194554d \
+    --hash=sha256:c053062984e61144385022e53678fbded7aea14ebb3e0305ae3592fb219ccfa4 \
+    --hash=sha256:d4198877797a83cbfe9bffa3803602bbe1625dc30d8a097365dbc762e5790faa \
+    --hash=sha256:e3c97a1555fd6388f857770ff8b9703083de6bf1f9274a002a332d65fbb56c8c \
+    --hash=sha256:e7cb0ae90dd83727f0c0718634ed56837bfeeee29a5f82a7514c03ee1364c019 \
+    --hash=sha256:f0700d54bcf45424477e46a9f0944155b46fb0639d69728739c0e47bab83f2b9 \
+    --hash=sha256:f1279ab38ecbfae7e456a108c5c0681e4956d5b1090027c1de0f934dfdb4b35c \
+    --hash=sha256:f4f118245c4a087776e0a8408be33cf09f6c547442c00395fbfb116fac2f8ac2
     # via
     #   ddsketch
     #   ddtrace