Merge remote-tracking branch 'refs/remotes/origin/main'

Author: dakshbhayana11811137

.python-version

@@ -1 +1 @@
-3.13.1
+3.13.2

Dockerfile

@@ -38,7 +38,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.13.1-slim-bookworm AS docs
+FROM python:3.13.2-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
@@ -107,7 +107,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.13.1-slim-bookworm AS build
+FROM python:3.13.2-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
@@ -191,7 +191,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.13.1-slim-bookworm
+FROM python:3.13.2-slim-bookworm
 
 # Setup some basic environment variables that are ~never going to change.
 ENV PYTHONUNBUFFERED 1

bin/deps

@@ -2,7 +2,7 @@
 set -ex
 
 export TMPDIR=$(mktemp -d)
-mkdir -p $TMPDIR/docs
+cp requirements/*.txt $TMPDIR/
 pip-compile -o $TMPDIR/deploy.txt requirements/deploy.in > /dev/null
 pip-compile -o $TMPDIR/main.txt requirements/main.in > /dev/null
 pip-compile -o $TMPDIR/lint.txt requirements/lint.in > /dev/null

bin/redis-tls

@@ -16,4 +16,10 @@ unset REDIS_PORT
 
 # Ensure all clients have a 5-second timeout.
 # Configure the TLS settings for our Redis connection
+# When adding parameters such as socket_timeout,
+# you may need to update the broker url parsing in
+# warehouse/tasks.py to apply them to celery_transport_options
+# See https://docs.celeryq.dev/projects/kombu/en/stable/_modules/kombu/connection.html#Connection
+# and https://docs.celeryq.dev/projects/kombu/en/stable/reference/kombu.transport.redis.html#transport-options
+# for available/allowed arguments/mappings
 REDIS_URL="$REDIS_URL?socket_timeout=5&ssl_cert_reqs=required&ssl_ca_certs=$(python -m certifi)"

requirements/deploy.in

@@ -1,2 +1,2 @@
 gunicorn==23.0.0
-ddtrace==2.21.1
+ddtrace==3.0.0

requirements/deploy.txt

@@ -8,75 +8,65 @@ bytecode==0.16.1 \
     --hash=sha256:1d4b61ed6bade4bff44127c8283bef8131a664ce4dbe09d64a88caf329939f35 \
     --hash=sha256:8fbbb637c880f339e564858bc6c7984ede67ae97bc71343379a535a9a4baf398
     # via ddtrace
-ddtrace==2.21.1 \
-    --hash=sha256:033ffec1d1fa8379e2dc545992674663c4c2aedc45b7a65eb82080868772a29b \
-    --hash=sha256:03d8e120a998395da2623bd5a0d95d4bb4a51a404f5d873192df6af957eda9ae \
-    --hash=sha256:06b87520802a8e7e9751e677fcde942d7e926f30feb25f47f3204751578315c6 \
-    --hash=sha256:094af629fabd45b942e6ca3786c518f9d16381830ced5a50af3c2a468d4d4131 \
-    --hash=sha256:0ab4afedbea77408c42bb644daf103d6ac09daeb5d867fd97c22bbb93c1af5e3 \
-    --hash=sha256:10d39b6a5fed423649dc42901dbd3b59d7d47a459d3fe19242cb99ccea121715 \
-    --hash=sha256:10d9c573290b3fb8998365e78fe5d92a7a0d2b218ad0aa60fece66c5e7b3dfc6 \
-    --hash=sha256:1537b9838db72490281f56b67e2b77c909ba7f6d5dbd84d12787e350feaefc09 \
-    --hash=sha256:193dd67b70ab8dd011171a7a5d1c34ef39492be3240c16c799a0c30731a39ecf \
-    --hash=sha256:22d1df6d717d90c6108a82f1d4c22aeb99d90840b267339c8be19f2124c17084 \
-    --hash=sha256:2368be73257fee5bcdb5573eb79be76227c075d43db04c09b4d5b543b7a97cfe \
-    --hash=sha256:244dbef525b69011e645c675736f4cb4263df8fd61b23a5122012180a7e422d4 \
-    --hash=sha256:2a6b3384c58ebfce57e6ac85ec36f9e0a40beba29967cbc7beac54c264a6d5a9 \
-    --hash=sha256:2c6edeaffc86c900df0fc3b2fa91d82e79bb5b45ec25098fa91b73604a424742 \
-    --hash=sha256:2c872d543f9e2f7239b1910d3e30556e74ec08473898b3b09ce8203d66f8f6fa \
-    --hash=sha256:30a582b9ec7d584de6a450457fcc9a17c4dc5cf407fab22387c782f0a8b38b17 \
-    --hash=sha256:319f30b9a30f9abbecd048f76c3ca1b085351882c253d682c34be515377b05c4 \
-    --hash=sha256:39e79b4df42eb8cb21f49def1247f4670ae2b1c18f1c098cffa8f3c9f9382897 \
-    --hash=sha256:3bdd27f445563cc87e56d227239d3ecd167570c50683aa9d9037b372623dda86 \
-    --hash=sha256:3c1e007d9634e66f38ac0cce180b5721c3e69b6572a6f7310b6d702626ffef33 \
-    --hash=sha256:3d93351157e5478741ea8adb0e9bd50832891045523289deb7b4b2e2154beae9 \
-    --hash=sha256:40b2b4102b621acbba800f9216bba04ee45cdbf857fd97bcde89052dfcbde738 \
-    --hash=sha256:464dc77b320bec99cf14d7cd48b490d751f0d92cec74dbe20c192c563ccedcbf \
-    --hash=sha256:499e416ca66afcdb2ddcbc5b2745cf09c39830dd9474a32299d39afe4fd6c061 \
-    --hash=sha256:506d5d45d5f4d66b16e86fd60e4b6efa11fb0b3ce743e8ddf822e46798627f13 \
-    --hash=sha256:564c465a2670c5085dc8e7369d4d0bacb6969dfd8d2f71b871ad0a55d8fba406 \
-    --hash=sha256:64b15b182e2d237b41ba7e4102a6f67bd5460a9c568a3d450156c2ecaa02eef5 \
-    --hash=sha256:67d3f5523908bf8314b4a4b970311be3a6e376504a932c8f38c81057f6ec968d \
-    --hash=sha256:6d001c9c356f0c30ee1e7fde9112616137ff5700e8cbb146ebba755813dbacc3 \
-    --hash=sha256:6efef0e9d93d865c51e8af07a1e20f8373a8f563c89d2e28bc295582b2197af9 \
-    --hash=sha256:7238d175de392c9f294f0eeac54f6fd882a89354b097c28191ff128dc2b32751 \
-    --hash=sha256:7627be9dc89ed509aafcf8630cc4ff4893bd9e29d6c46ca76a7107d26cd8ee0e \
-    --hash=sha256:78bcd5fb8c7940773b17d8acc89918c4fea994a7a42d527b3a5cfe4194f83cb4 \
-    --hash=sha256:79e9c92073fdaa1a6ac2ab90a4b716d3d41fa7241c3e24f78ac288f2ddc7b2cd \
-    --hash=sha256:7b6be9d87c983aa36513a8927de6821e4e41e44891a5325f34034d3682277632 \
-    --hash=sha256:7db644c1f9a8d12352501b2b861c5a471858e5db7bfb386d3055ae16c30f84dc \
-    --hash=sha256:86401dbb0386cf8f3e99872aedb6756421d4059ef1497715b5a9231d784800bf \
-    --hash=sha256:89dcf45eec6562ad07ed8768f3c59458861a5e153f893ba27d602bccba5577c1 \
-    --hash=sha256:8b4321d14771a29024cc293359ea6e89fb0dd27ca26c074c4e0e75fa73619ada \
-    --hash=sha256:9adbd1704b225ab959fcd7a9a06e27db9539c4c5489843221f1fb2f30d7c9285 \
-    --hash=sha256:9d93095ebce412e9d2ba60331bf85bccdbffe9df4a2685c71cff2a2e7b6962c2 \
-    --hash=sha256:a24ad38420708c27ff8a74b76c6e408394326de1e5a0ac000e58eba43c842849 \
-    --hash=sha256:a2d1f859c230130b75ad00d114d9c779f57c172ebe5f80ed221b0f20542a17c1 \
-    --hash=sha256:a9ae19cc770bc6805b0f99f7498664c84d65319afe667fbaa0770387bc860918 \
-    --hash=sha256:ab4b6f4c9993862fe1a8312b258a313a1cb9033fbaf6ce1bfa2bac45643e4342 \
-    --hash=sha256:aee95a14edec99e1dd78f5d4232bcee49b7effe8b1f501b3d90fc6e0f0f3887c \
-    --hash=sha256:bd4386831798c3519f6bbdc243c10dfc856b954b5fcee57a100a38ae1c6e23bd \
-    --hash=sha256:bf1fdbbfb2dd8da09f03a05b0eec578182fe3de6b37f6d3053e6110337b9c1df \
-    --hash=sha256:c0030168927ac5efc76b8abdeeb900946958e3ede22a67ba5b36e68db5f0eb49 \
-    --hash=sha256:c81822960d8b8b4f52f51c105082c22d2239abaa40172e0be92749a13247ea3a \
-    --hash=sha256:c8e101a9119ec6d6545a964f32647a2505dd7647bc0286a6076392cb7ede3d24 \
-    --hash=sha256:d2cb22d02eac9de92d1bae7a1ed0c94a2ea0a58b03ef93c4808feac30542d658 \
-    --hash=sha256:d4314d7866cdc7bfd345220a0089b609564398a5805df79d91be4159e75a191e \
-    --hash=sha256:d5e398265cfa319277136bee3ca8aba589b19258e91f27cc8282b58e9efc8372 \
-    --hash=sha256:d990accaccc628f881c5c7d2f95976f5aac4ed826f833cb595d5e70164bd3bab \
-    --hash=sha256:dac2d22a35cf3813be66231a3e1c2e2e0f588c8dc797f72c30342636f8c9ac44 \
-    --hash=sha256:dc16c0ccdeaa5ed6232e3bdc9778047fbfc668298c6176584a3a204544886300 \
-    --hash=sha256:debf031783191919b0904a3161bafcfa0cbc0898ac24cbefc09761cbe2c51767 \
-    --hash=sha256:eaf52f327da0dec3942e86dd52a7ac6ecc238f8c8f6e7b726cf9e5098901de97 \
-    --hash=sha256:ee28807a0bfc82a9e536f1858778f70c3086bdecc7b5fffb1a154275d6457810 \
-    --hash=sha256:f0eec539cb6892548134da9dabf08eb29be8a92b72c346f3ce3f4f0087c4941c \
-    --hash=sha256:f2e9da400832a28d96c5998e4019382e3067537b6956e6f4eecd69217f0eb3ef \
-    --hash=sha256:f808f753259fcedc922a0cc6a4bab16d24e50fbab7a83fe854c1da1be690772c \
-    --hash=sha256:f83915613c91b256ab2bc4739f59a86d5cf1a657141971bc50b0414a6172e5c5 \
-    --hash=sha256:fc963e066c43bdd746d6174ac9ff75506a668c16b1ebc7648de78f244ed3a3c5 \
-    --hash=sha256:fe539d5fe473066df62fcdf9b703b50f66fa8dd9690c132ab4890a428f3834f1 \
-    --hash=sha256:fe942486fea63b2d8eaa0e434047c8489f88a4134b5fbd86e132f87dbd8346b8 \
-    --hash=sha256:ff9eef25fed65ec70a2cef63e3ac224b0e4f81c0d495c601243a77cd57674f0a
+ddtrace==3.0.0 \
+    --hash=sha256:00c5eca3949072851f7d33c63952f923b0eb0b5950e0f7241e6935ea289b570a \
+    --hash=sha256:089fcbd57ff66c4fb0f6afa6658a712ab4d25199e144c8cf991eb49939c18744 \
+    --hash=sha256:0ee098c7b500926f5fe64be88269a8aa8579e454bf27c52c9cf083552b701288 \
+    --hash=sha256:14c01a2e247983b981a1b4a2ba7a2b4413dbc18f95b02b82e0c0f6963a790791 \
+    --hash=sha256:15a1915316d368fd7281d5d39b1badfda716d98172f4a8dd5a5a545a7573f260 \
+    --hash=sha256:176ec034d86bc22c485ab63862ffb2a767a5d69a063139c20a62fca9f633ae37 \
+    --hash=sha256:17dda2845ec41530457676cd1a475e6c8981ec9e05bfa39da4fa7bd2af0c11c4 \
+    --hash=sha256:19471e50c60f41d4003c08c0dbbdb4d51467d8fdde717368ce2979b3977ed25c \
+    --hash=sha256:1b1977b11312a2f810112ce45827e59f4211775a2181ac5e3c031a11571d5a7c \
+    --hash=sha256:1f61d492394b4b1534f3cfeba819fbe1adf3fcf4b773245fb5254645f8b37528 \
+    --hash=sha256:392299a8722fde8908063ed1743c3117aa21a441617a6f133a57f96296c870ee \
+    --hash=sha256:3b5e3835106f89940d82f4f188e599d87e53b9cf071979cf8be3cc9e830cbd06 \
+    --hash=sha256:3e57a4b5c62cc2c3e37b4f69e24506cc471097af9a601b14c9d252130944b48e \
+    --hash=sha256:3ff34424067fa6c55545319c0a024e0e264696366f847a0c9f173107b8f23b26 \
+    --hash=sha256:425c08367af9d848791b94bb0ea7d4f2908cb0488eb58447cadf09b0bf2c9132 \
+    --hash=sha256:4a7f1fd6a0069d1192afc72f83fb4347a779841d7d99c951581fbf930bfbeb86 \
+    --hash=sha256:4d06a5432efd28a221984dff469d5a5dee85ad56907ecd9ea5b8901998011bb2 \
+    --hash=sha256:4e6ec651745aa689ee57f37ecf9f0b6b63888570c48af4e1906f9709dcabf4e2 \
+    --hash=sha256:516d1e85da12e164df7006247577b4a416077a5188662d0bb80fe84d308e097b \
+    --hash=sha256:56947f44dfae0f87ef5d47836bad9b54ca95e1c95561e77d2abaa03adde6b5c7 \
+    --hash=sha256:6742de5a8101e230c5c602417daaf56711b6cf52e561b121898cc51f273fa2c4 \
+    --hash=sha256:6a648773f555bc5c07e0793f2d1cb617b7650ddbf34b9f619ec5c9cab68bfd10 \
+    --hash=sha256:6c43196740abe4e138a67334ba8b08d6faabbf334868f39b5fc8a12293266380 \
+    --hash=sha256:6f6c4f822d2018b1955f69519b30a7ed5b0737710e06608eedf67d6a7dbda822 \
+    --hash=sha256:6fba529a0153c410bb79fc3ce8de4c68da8d3c40171c7f3879002c5fbf83b834 \
+    --hash=sha256:7f07462fe3dc030f9f7bf277950c7844cdc0f7ca4a2df4f4571b0dc10f867a43 \
+    --hash=sha256:85365fab771b9efb515a41083310100700c54ce25be222941dcf8c599dd2e94e \
+    --hash=sha256:861752fb7cb52797c7d5bb3e55d021f5b9bacee3d7057563f2dd8dbacf2a47eb \
+    --hash=sha256:86aa2c4224f47201ea3745f23f106e2f5baa4da900d92a05ec36835815bcd23c \
+    --hash=sha256:8dc0f2d854c4c396a3491a97ab0f10ff6127d392c5999c68fd636e1854a93d50 \
+    --hash=sha256:901dc1fe8612d855ba10aed57f85db31a40acbb60fd4112b85d185f6f670eafc \
+    --hash=sha256:918cdaaf1afef8f04d3e658f2d2da642e012e0e86df1d184fa23a5df19689c84 \
+    --hash=sha256:96fc4ef086b262f7c0906717aca346c68b9590f965302cfc414ddb0e969e065b \
+    --hash=sha256:9aa58ad390828dad400ad48bfafc257d9112df64695a673feeeed18a50ff6ee8 \
+    --hash=sha256:9c4735c9c8b35df7430919b9498990578e711a9ede3f4759283be1755480440d \
+    --hash=sha256:a8101edc6540cccc261a3cfa5103a2c47889b27d1fcb249ba5dd21c745de8b99 \
+    --hash=sha256:ae85c0bd10e443cbe8cf72cc1e6d87f941a5575980fff73c52eb8abbd822b04a \
+    --hash=sha256:b44562894bc879e67a99c93582c1820cb00af279de37e6e8c275112d7a94c446 \
+    --hash=sha256:b91f6043260c36230eb5b8f05cdf0225045d867cc14de088b59070353724c2ec \
+    --hash=sha256:b9669a4471af928e9ca10881b64a0133d63b9b606eae5888005b45ee3fb17b4d \
+    --hash=sha256:bc95675628af7053f16e6e2f8c60ad78fd016d6d8103808dd1b890477cf5a5a1 \
+    --hash=sha256:be01dfda0a17e223b0c17f727183a85e4b5773d91d9c7e65e4c205ee59c7069e \
+    --hash=sha256:c0f7c3eb64bc843c8dcc32edff3bef1a363ee20a1345223e8d018f0da33e3819 \
+    --hash=sha256:c8ead28c64688d45d9612573a9006f50ca9cda5282f2592a98e49bbb3605913e \
+    --hash=sha256:cd0ba978029a828ad0fecb615c4a997600dc587c87f8ef9b66082bdc6f364c55 \
+    --hash=sha256:cde24148a4d8b5909aad748435384cd1bf46f3524ef755eef63fc40435b732a3 \
+    --hash=sha256:d0a3876b0695fc4c17798ca15bb6db688aa341800c7a42b9d991c99b806dc4c2 \
+    --hash=sha256:d9af9073e0ff60d64b95fbbb519fc4201a7cb7091ee5a430f7eac47468f51a4e \
+    --hash=sha256:db8be7c816faad27bbf4c5580a0e37dd80ee864bc37d4cffe13b794b50d43106 \
+    --hash=sha256:ddb3944795b3e06e0b7f6641bee92b9a373dbec5c3400bd9f6ca822c34d1c6a0 \
+    --hash=sha256:e313370c8c1198df007d8ef6c448c1fecc2de0f353ae664ae9fd8e9ddf7ba06b \
+    --hash=sha256:e50a1a87bc4114a723d371eb75559be2e687ffe325f5eaf22f3da74fe25bc97a \
+    --hash=sha256:ea1fb7f33099baa530a7689407f36b426635ea5229057a4c13e8a88bd8055d97 \
+    --hash=sha256:ea6269f2e390986e5790d61b7e44687ef62d923e83b65148224067a7e559c8ac \
+    --hash=sha256:eb5713327147605a70b935891b56524a6e989e5257bbda98c0fd0217fc1ee004 \
+    --hash=sha256:f3498054f3821134fe5a7e53bdc0cc37859c8ca8b9867b776efe0acf5f856f41 \
+    --hash=sha256:f69a7994d967581bdb17919eca735c2b76470bc1039cb1bd7c059e47d12b62d2 \
+    --hash=sha256:fd14da22dc900edb146c489c7d7fbaeb2e516115c45887fa9e964f9931094564
     # via -r requirements/deploy.in
 deprecated==1.2.18 \
     --hash=sha256:422b6f6d859da6f2ef57857761bfb392480502a64c3028ca9bbe86085d72115d \