Merge branch 'main' into update/non_aws

.buildkite/pipeline.yml

@@ -57,9 +57,10 @@ steps:
       queue: "scala"
 
   - command:
-      pip3 install --user tox &&
-      cd scripts &&
-      /var/lib/buildkite-agent/.local/bin/tox -e py3
+      - cd scripts
+      - python3 -m venv venv && source venv/bin/activate
+      - pip3 install tox
+      - venv/bin/tox -e py3
     label: "Test Python scripts"
 
   - wait

monitoring/daily_reporter/requirements.txt

@@ -1,27 +1,52 @@
 #
-# This file is autogenerated by pip-compile
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.10
+# by the following command:
 #
 #    pip-compile
 #
-boto3==1.13.12            # via -r requirements.in
-botocore==1.16.12         # via boto3, s3transfer
-certifi==2020.4.5.1       # via httpx
-chardet==3.0.4            # via httpx
-docutils==0.15.2          # via botocore
-h11==0.9.0                # via httpx
-h2==3.2.0                 # via httpx
-hpack==3.0.0              # via h2
-hstspreload==2020.5.19    # via httpx
-httpx==0.12.1             # via -r requirements.in
-hyperframe==5.2.0         # via h2
-idna==2.9                 # via httpx
-jinja2==2.11.2            # via -r requirements.in
-jmespath==0.10.0          # via boto3, botocore
-markupsafe==1.1.1         # via jinja2
-python-dateutil==2.8.1    # via botocore
-rfc3986==1.4.0            # via httpx
-s3transfer==0.3.3         # via boto3
-six==1.14.0               # via python-dateutil
-sniffio==1.1.0            # via httpx
-urllib3==1.25.9           # via botocore, httpx
+anyio==4.6.0
+    # via httpx
+boto3==1.35.32
+    # via -r requirements.in
+botocore==1.35.32
+    # via
+    #   boto3
+    #   s3transfer
+certifi==2024.8.30
+    # via
+    #   httpcore
+    #   httpx
+exceptiongroup==1.2.2
+    # via anyio
+h11==0.14.0
+    # via httpcore
+httpcore==1.0.6
+    # via httpx
+httpx==0.27.2
+    # via -r requirements.in
+idna==3.10
+    # via
+    #   anyio
+    #   httpx
+jinja2==3.1.4
+    # via -r requirements.in
+jmespath==1.0.1
+    # via
+    #   boto3
+    #   botocore
+markupsafe==2.1.5
+    # via jinja2
+python-dateutil==2.9.0.post0
+    # via botocore
+s3transfer==0.10.2
+    # via boto3
+six==1.16.0
+    # via python-dateutil
+sniffio==1.3.1
+    # via
+    #   anyio
+    #   httpx
+typing-extensions==4.12.2
+    # via anyio
+urllib3==2.2.3
+    # via botocore

monitoring/end_to_end_bag_test/requirements.txt

@@ -1,22 +1,44 @@
 #
-# This file is autogenerated by pip-compile
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.10
+# by the following command:
 #
 #    pip-compile
 #
-certifi==2020.4.5.1       # via httpx, requests
-chardet==3.0.4            # via httpx, requests
-h11==0.9.0                # via httpx
-h2==3.2.0                 # via httpx
-hpack==3.0.0              # via h2
-hstspreload==2020.5.13    # via httpx
-httpx==0.12.1
-hyperframe==5.2.0         # via h2
-idna==2.9                 # via httpx, requests
-oauthlib==3.1.0           # via requests-oauthlib
-requests-oauthlib==1.3.0  # via wellcome-storage-service
-requests==2.23.0          # via requests-oauthlib
-rfc3986==1.4.0            # via httpx
-sniffio==1.1.0            # via httpx
-urllib3==1.25.9           # via httpx, requests
+anyio==4.6.0
+    # via httpx
+certifi==2024.8.30
+    # via
+    #   httpcore
+    #   httpx
+    #   requests
+charset-normalizer==3.3.2
+    # via requests
+exceptiongroup==1.2.2
+    # via anyio
+h11==0.14.0
+    # via httpcore
+httpcore==1.0.6
+    # via httpx
+httpx==0.27.2
+    # via -r requirements.in
+idna==3.10
+    # via
+    #   anyio
+    #   httpx
+    #   requests
+oauthlib==3.2.2
+    # via requests-oauthlib
+requests==2.32.3
+    # via requests-oauthlib
+requests-oauthlib==1.3.1
+    # via wellcome-storage-service
+sniffio==1.3.1
+    # via
+    #   anyio
+    #   httpx
+typing-extensions==4.12.2
+    # via anyio
+urllib3==2.2.3
+    # via requests
 wellcome-storage-service==1.5.0
+    # via -r requirements.in

monitoring/end_to_end_bag_test/src/end_to_end_bag_test.py

@@ -53,7 +53,7 @@ def main(*args):
     print(ingest_location)
 
     ingest_id = ingest_location.split("/")[-1]
-    return f"https://ingest-inspector.wellcomecollection.org/ingests/{ingest_id}"
+    return f"https://ingest-inspector.wellcomecollection.org/?ingestId={ingest_id}"
 
 
 if __name__ == "__main__":

monitoring/ingest_inspector/frontend/package.json

@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "classnames": "^2.5.1",
-    "next": "14.2.4",
+    "next": "14.2.10",
     "nprogress": "^0.2.0",
     "react": "^18",
     "react-dom": "^18",

python_client/test_requirements.txt

@@ -8,7 +8,7 @@ atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 betamax-serializers==0.2.1
 betamax==0.8.1
-certifi==2019.3.9         # via requests
+certifi==2024.8.30        # via requests
 chardet==3.0.4            # via requests
 coverage==4.5.3
 idna==2.8                 # via requests

scripts/test_requirements.in

@@ -1,4 +1,4 @@
-moto<4
+moto
 pytest
 pytest-cov
 coverage