diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 862546595b..57e1757547 100644 --- a/.buildkite/pipeline.yml +++ b/.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 diff --git a/monitoring/daily_reporter/requirements.txt b/monitoring/daily_reporter/requirements.txt index b9600cc48f..090b967310 100644 --- a/monitoring/daily_reporter/requirements.txt +++ b/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 diff --git a/monitoring/end_to_end_bag_test/requirements.txt b/monitoring/end_to_end_bag_test/requirements.txt index 57b7981ef3..494f0e355c 100644 --- a/monitoring/end_to_end_bag_test/requirements.txt +++ b/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 diff --git a/monitoring/end_to_end_bag_test/src/end_to_end_bag_test.py b/monitoring/end_to_end_bag_test/src/end_to_end_bag_test.py index 8cc219b08a..996514ab06 100755 --- a/monitoring/end_to_end_bag_test/src/end_to_end_bag_test.py +++ b/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__": diff --git a/monitoring/ingest_inspector/frontend/package-lock.json b/monitoring/ingest_inspector/frontend/package-lock.json index f00205f20d..365d5f8356 100644 --- a/monitoring/ingest_inspector/frontend/package-lock.json +++ b/monitoring/ingest_inspector/frontend/package-lock.json @@ -9,7 +9,7 @@ "version": "0.1.0", "dependencies": { "classnames": "^2.5.1", - "next": "14.2.4", + "next": "14.2.10", "nprogress": "^0.2.0", "react": "^18", "react-dom": "^18", @@ -224,9 +224,9 @@ } }, "node_modules/@next/env": { - "version": "14.2.4", - "resolved": "https://registry.npmjs.org/@next/env/-/env-14.2.4.tgz", - "integrity": "sha512-3EtkY5VDkuV2+lNmKlbkibIJxcO4oIHEhBWne6PaAp+76J9KoSsGvNikp6ivzAT8dhhBMYrm6op2pS1ApG0Hzg==" + "version": "14.2.10", + "resolved": "https://registry.npmjs.org/@next/env/-/env-14.2.10.tgz", + "integrity": "sha512-dZIu93Bf5LUtluBXIv4woQw2cZVZ2DJTjax5/5DOs3lzEOeKLy7GxRSr4caK9/SCPdaW6bCgpye6+n4Dh9oJPw==" }, "node_modules/@next/eslint-plugin-next": { "version": "14.2.4", @@ -238,9 +238,9 @@ } }, "node_modules/@next/swc-darwin-arm64": { - "version": "14.2.4", - "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.4.tgz", - "integrity": "sha512-AH3mO4JlFUqsYcwFUHb1wAKlebHU/Hv2u2kb1pAuRanDZ7pD/A/KPD98RHZmwsJpdHQwfEc/06mgpSzwrJYnNg==", + "version": "14.2.10", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.10.tgz", + "integrity": "sha512-V3z10NV+cvMAfxQUMhKgfQnPbjw+Ew3cnr64b0lr8MDiBJs3eLnM6RpGC46nhfMZsiXgQngCJKWGTC/yDcgrDQ==", "cpu": [ "arm64" ], @@ -253,9 +253,9 @@ } }, "node_modules/@next/swc-darwin-x64": { - "version": "14.2.4", - "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.4.tgz", - "integrity": "sha512-QVadW73sWIO6E2VroyUjuAxhWLZWEpiFqHdZdoQ/AMpN9YWGuHV8t2rChr0ahy+irKX5mlDU7OY68k3n4tAZTg==", + "version": "14.2.10", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.10.tgz", + "integrity": "sha512-Y0TC+FXbFUQ2MQgimJ/7Ina2mXIKhE7F+GUe1SgnzRmwFY3hX2z8nyVCxE82I2RicspdkZnSWMn4oTjIKz4uzA==", "cpu": [ "x64" ], @@ -268,9 +268,9 @@ } }, "node_modules/@next/swc-linux-arm64-gnu": { - "version": "14.2.4", - "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.4.tgz", - "integrity": "sha512-KT6GUrb3oyCfcfJ+WliXuJnD6pCpZiosx2X3k66HLR+DMoilRb76LpWPGb4tZprawTtcnyrv75ElD6VncVamUQ==", + "version": "14.2.10", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.10.tgz", + "integrity": "sha512-ZfQ7yOy5zyskSj9rFpa0Yd7gkrBnJTkYVSya95hX3zeBG9E55Z6OTNPn1j2BTFWvOVVj65C3T+qsjOyVI9DQpA==", "cpu": [ "arm64" ], @@ -283,9 +283,9 @@ } }, "node_modules/@next/swc-linux-arm64-musl": { - "version": "14.2.4", - "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.4.tgz", - "integrity": "sha512-Alv8/XGSs/ytwQcbCHwze1HmiIkIVhDHYLjczSVrf0Wi2MvKn/blt7+S6FJitj3yTlMwMxII1gIJ9WepI4aZ/A==", + "version": "14.2.10", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.10.tgz", + "integrity": "sha512-n2i5o3y2jpBfXFRxDREr342BGIQCJbdAUi/K4q6Env3aSx8erM9VuKXHw5KNROK9ejFSPf0LhoSkU/ZiNdacpQ==", "cpu": [ "arm64" ], @@ -298,9 +298,9 @@ } }, "node_modules/@next/swc-linux-x64-gnu": { - "version": "14.2.4", - "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.4.tgz", - "integrity": "sha512-ze0ShQDBPCqxLImzw4sCdfnB3lRmN3qGMB2GWDRlq5Wqy4G36pxtNOo2usu/Nm9+V2Rh/QQnrRc2l94kYFXO6Q==", + "version": "14.2.10", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.10.tgz", + "integrity": "sha512-GXvajAWh2woTT0GKEDlkVhFNxhJS/XdDmrVHrPOA83pLzlGPQnixqxD8u3bBB9oATBKB//5e4vpACnx5Vaxdqg==", "cpu": [ "x64" ], @@ -313,9 +313,9 @@ } }, "node_modules/@next/swc-linux-x64-musl": { - "version": "14.2.4", - "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.4.tgz", - "integrity": "sha512-8dwC0UJoc6fC7PX70csdaznVMNr16hQrTDAMPvLPloazlcaWfdPogq+UpZX6Drqb1OBlwowz8iG7WR0Tzk/diQ==", + "version": "14.2.10", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.10.tgz", + "integrity": "sha512-opFFN5B0SnO+HTz4Wq4HaylXGFV+iHrVxd3YvREUX9K+xfc4ePbRrxqOuPOFjtSuiVouwe6uLeDtabjEIbkmDA==", "cpu": [ "x64" ], @@ -328,9 +328,9 @@ } }, "node_modules/@next/swc-win32-arm64-msvc": { - "version": "14.2.4", - "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.4.tgz", - "integrity": "sha512-jxyg67NbEWkDyvM+O8UDbPAyYRZqGLQDTPwvrBBeOSyVWW/jFQkQKQ70JDqDSYg1ZDdl+E3nkbFbq8xM8E9x8A==", + "version": "14.2.10", + "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.10.tgz", + "integrity": "sha512-9NUzZuR8WiXTvv+EiU/MXdcQ1XUvFixbLIMNQiVHuzs7ZIFrJDLJDaOF1KaqttoTujpcxljM/RNAOmw1GhPPQQ==", "cpu": [ "arm64" ], @@ -343,9 +343,9 @@ } }, "node_modules/@next/swc-win32-ia32-msvc": { - "version": "14.2.4", - "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.4.tgz", - "integrity": "sha512-twrmN753hjXRdcrZmZttb/m5xaCBFa48Dt3FbeEItpJArxriYDunWxJn+QFXdJ3hPkm4u7CKxncVvnmgQMY1ag==", + "version": "14.2.10", + "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.10.tgz", + "integrity": "sha512-fr3aEbSd1GeW3YUMBkWAu4hcdjZ6g4NBl1uku4gAn661tcxd1bHs1THWYzdsbTRLcCKLjrDZlNp6j2HTfrw+Bg==", "cpu": [ "ia32" ], @@ -358,9 +358,9 @@ } }, "node_modules/@next/swc-win32-x64-msvc": { - "version": "14.2.4", - "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.4.tgz", - "integrity": "sha512-tkLrjBzqFTP8DVrAAQmZelEahfR9OxWpFR++vAI9FBhCiIxtwHwBHC23SBHCTURBtwB4kc/x44imVOnkKGNVGg==", + "version": "14.2.10", + "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.10.tgz", + "integrity": "sha512-UjeVoRGKNL2zfbcQ6fscmgjBAS/inHBh63mjIlfPg/NG8Yn2ztqylXt5qilYb6hoHIwaU2ogHknHWWmahJjgZQ==", "cpu": [ "x64" ], @@ -3181,11 +3181,11 @@ "dev": true }, "node_modules/next": { - "version": "14.2.4", - "resolved": "https://registry.npmjs.org/next/-/next-14.2.4.tgz", - "integrity": "sha512-R8/V7vugY+822rsQGQCjoLhMuC9oFj9SOi4Cl4b2wjDrseD0LRZ10W7R6Czo4w9ZznVSshKjuIomsRjvm9EKJQ==", + "version": "14.2.10", + "resolved": "https://registry.npmjs.org/next/-/next-14.2.10.tgz", + "integrity": "sha512-sDDExXnh33cY3RkS9JuFEKaS4HmlWmDKP1VJioucCG6z5KuA008DPsDZOzi8UfqEk3Ii+2NCQSJrfbEWtZZfww==", "dependencies": { - "@next/env": "14.2.4", + "@next/env": "14.2.10", "@swc/helpers": "0.5.5", "busboy": "1.6.0", "caniuse-lite": "^1.0.30001579", @@ -3200,15 +3200,15 @@ "node": ">=18.17.0" }, "optionalDependencies": { - "@next/swc-darwin-arm64": "14.2.4", - "@next/swc-darwin-x64": "14.2.4", - "@next/swc-linux-arm64-gnu": "14.2.4", - "@next/swc-linux-arm64-musl": "14.2.4", - "@next/swc-linux-x64-gnu": "14.2.4", - "@next/swc-linux-x64-musl": "14.2.4", - "@next/swc-win32-arm64-msvc": "14.2.4", - "@next/swc-win32-ia32-msvc": "14.2.4", - "@next/swc-win32-x64-msvc": "14.2.4" + "@next/swc-darwin-arm64": "14.2.10", + "@next/swc-darwin-x64": "14.2.10", + "@next/swc-linux-arm64-gnu": "14.2.10", + "@next/swc-linux-arm64-musl": "14.2.10", + "@next/swc-linux-x64-gnu": "14.2.10", + "@next/swc-linux-x64-musl": "14.2.10", + "@next/swc-win32-arm64-msvc": "14.2.10", + "@next/swc-win32-ia32-msvc": "14.2.10", + "@next/swc-win32-x64-msvc": "14.2.10" }, "peerDependencies": { "@opentelemetry/api": "^1.1.0", diff --git a/monitoring/ingest_inspector/frontend/package.json b/monitoring/ingest_inspector/frontend/package.json index e8152688ec..3f857fed53 100644 --- a/monitoring/ingest_inspector/frontend/package.json +++ b/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", diff --git a/python_client/test_requirements.txt b/python_client/test_requirements.txt index 894fb2732e..66f342cf9e 100644 --- a/python_client/test_requirements.txt +++ b/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 diff --git a/scripts/test_requirements.in b/scripts/test_requirements.in index 256d928b5d..8b71392875 100644 --- a/scripts/test_requirements.in +++ b/scripts/test_requirements.in @@ -1,4 +1,4 @@ -moto<4 +moto pytest pytest-cov coverage diff --git a/scripts/test_requirements.txt b/scripts/test_requirements.txt index 234a7c7126..bbc22d0a91 100644 --- a/scripts/test_requirements.txt +++ b/scripts/test_requirements.txt @@ -1,88 +1,84 @@ # -# This file is autogenerated by pip-compile -# To update, run: +# This file is autogenerated by pip-compile with Python 3.9 +# by the following command: # # pip-compile test_requirements.in # -attrs==22.1.0 - # via pytest -boto3==1.24.59 +boto3==1.35.32 # via moto -botocore==1.27.59 +botocore==1.35.32 # via # boto3 # moto # s3transfer -certifi==2022.6.15 +certifi==2024.8.30 # via requests -cffi==1.15.1 +cffi==1.17.1 # via cryptography -charset-normalizer==2.1.1 +charset-normalizer==3.3.2 # via requests -coverage[toml]==6.4.4 +coverage[toml]==7.6.1 # via # -r test_requirements.in # pytest-cov -cryptography==37.0.4 +cryptography==43.0.1 # via moto -idna==3.3 +exceptiongroup==1.2.2 + # via pytest +idna==3.10 # via requests -iniconfig==1.1.1 +iniconfig==2.0.0 # via pytest -jinja2==3.1.2 +jinja2==3.1.4 # via moto jmespath==1.0.1 # via # boto3 # botocore -markupsafe==2.1.1 +markupsafe==2.1.5 # via # jinja2 - # moto -moto==3.1.18 + # werkzeug +moto==5.0.16 # via -r test_requirements.in -packaging==21.3 - # via pytest -pluggy==1.0.0 +packaging==24.1 # via pytest -py==1.11.0 +pluggy==1.5.0 # via pytest -pycparser==2.21 +pycparser==2.22 # via cffi -pyparsing==3.0.9 - # via packaging -pytest-cov==3.0.0 - # via -r test_requirements.in -pytest==7.1.2 +pytest==8.3.3 # via # -r test_requirements.in # pytest-cov -python-dateutil==2.8.2 +pytest-cov==5.0.0 + # via -r test_requirements.in +python-dateutil==2.9.0.post0 # via # botocore # moto -pytz==2022.2.1 - # via moto -requests==2.28.1 +pyyaml==6.0.2 + # via responses +requests==2.32.3 # via # moto # responses -responses==0.21.0 +responses==0.25.3 # via moto -s3transfer==0.6.0 +s3transfer==0.10.2 # via boto3 six==1.16.0 # via python-dateutil -tomli==2.0.1 +tomli==2.0.2 # via # coverage # pytest -urllib3==1.26.12 +urllib3==1.26.20 # via # botocore # requests # responses -werkzeug==2.1.2 +werkzeug==3.0.4 # via moto xmltodict==0.13.0 # via moto diff --git a/scripts/tests/test_dynamo.py b/scripts/tests/test_dynamo.py index 181e45abed..d6c980880a 100644 --- a/scripts/tests/test_dynamo.py +++ b/scripts/tests/test_dynamo.py @@ -9,7 +9,7 @@ @pytest.fixture def client(): - with moto.mock_dynamodb2(): + with moto.mock_aws(): yield boto3.resource("dynamodb", region_name="eu-west-1").meta.client diff --git a/scripts/tests/test_s3.py b/scripts/tests/test_s3.py index cba0a8529f..663bb37afc 100644 --- a/scripts/tests/test_s3.py +++ b/scripts/tests/test_s3.py @@ -7,7 +7,7 @@ @pytest.fixture def client(): - with moto.mock_s3(): + with moto.mock_aws(): yield boto3.client("s3", region_name="us-east-1") diff --git a/scripts/tests/test_secrets.py b/scripts/tests/test_secrets.py index 4be73fd202..2973e771e9 100644 --- a/scripts/tests/test_secrets.py +++ b/scripts/tests/test_secrets.py @@ -7,7 +7,7 @@ @pytest.fixture def client(): - with moto.mock_secretsmanager(): + with moto.mock_aws(): yield boto3.client("secretsmanager", region_name="eu-west-1") diff --git a/scripts/tox.ini b/scripts/tox.ini index 40eb4b6d19..b368e80b00 100644 --- a/scripts/tox.ini +++ b/scripts/tox.ini @@ -6,5 +6,5 @@ skipsdist = True deps = -r{toxinidir}/test_requirements.txt commands = - coverage run -m py.test tests + coverage run -m pytest tests coverage report