From 4fde357ca4f2b414278a78cb9a87e199fb228d01 Mon Sep 17 00:00:00 2001 From: Frank Niessink Date: Mon, 15 Jul 2024 11:30:12 +0200 Subject: [PATCH] Update several dependencies. --- components/api_server/pyproject.toml | 4 +- .../requirements/requirements-dev.txt | 6 +- components/api_server/src/healthcheck.py | 2 +- components/collector/pyproject.toml | 2 +- components/frontend/package-lock.json | 59 +++++++++---------- components/frontend/package.json | 6 +- .../frontend/src/widgets/WarningMessage.js | 2 +- components/notifier/pyproject.toml | 2 +- components/shared_code/pyproject.toml | 2 +- docs/pyproject.toml | 2 +- release/pyproject.toml | 2 +- tests/application_tests/pyproject.toml | 4 +- .../requirements/requirements-dev.txt | 6 +- tests/feature_tests/pyproject.toml | 4 +- .../requirements/requirements-dev.txt | 6 +- 15 files changed, 52 insertions(+), 57 deletions(-) diff --git a/components/api_server/pyproject.toml b/components/api_server/pyproject.toml index 4e20091952..8816b9f91f 100644 --- a/components/api_server/pyproject.toml +++ b/components/api_server/pyproject.toml @@ -24,7 +24,7 @@ optional-dependencies.dev = [ "pydantic==2.8.2", # Needed for importing the data model in the tests from the shared code component "types-cryptography==3.3.23.2", "types-ldap3==2.9.13.20240205", - "types-requests==2.32.0.20240622", + "types-requests==2.32.0.20240712", "unittest-xml-reporting==3.2.0", # Needed to generate JUnit XML output for Sonarcloud.io ] optional-dependencies.tools = [ @@ -33,7 +33,7 @@ optional-dependencies.tools = [ "mypy==1.10.1", "pip-audit==2.7.3", "pyproject-fmt==2.1.4", - "ruff==0.5.1", + "ruff==0.5.2", "vulture==2.11", ] diff --git a/components/api_server/requirements/requirements-dev.txt b/components/api_server/requirements/requirements-dev.txt index 8ac1457210..571289a3cb 100644 --- a/components/api_server/requirements/requirements-dev.txt +++ b/components/api_server/requirements/requirements-dev.txt @@ -725,9 +725,9 @@ types-pyasn1==0.6.0.20240402 \ --hash=sha256:5d54dcb33f69dd269071ca098e923ac20c5f03c814631fa7f3ed9ee035a5da3a \ --hash=sha256:848d01e7313c200acc035a8b3d377fe7b2aecbe77f2be49eb160a7f82835aaaf # via types-ldap3 -types-requests==2.32.0.20240622 \ - --hash=sha256:97bac6b54b5bd4cf91d407e62f0932a74821bc2211f22116d9ee1dd643826caf \ - --hash=sha256:ed5e8a412fcc39159d6319385c009d642845f250c63902718f605cd90faade31 +types-requests==2.32.0.20240712 \ + --hash=sha256:90c079ff05e549f6bf50e02e910210b98b8ff1ebdd18e19c873cd237737c1358 \ + --hash=sha256:f754283e152c752e46e70942fa2a146b5bc70393522257bb85bd1ef7e019dcc3 # via api-server (pyproject.toml) typing-extensions==4.12.2 \ --hash=sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d \ diff --git a/components/api_server/src/healthcheck.py b/components/api_server/src/healthcheck.py index 214f3c6edd..04a9a93548 100644 --- a/components/api_server/src/healthcheck.py +++ b/components/api_server/src/healthcheck.py @@ -8,7 +8,7 @@ api_server_port = getenv("API_SERVER_PORT", "5001") exit_code = 1 try: - with urlopen(f"http://localhost:{api_server_port}/api/health") as response: # nosec B310 # noqa: S310 + with urlopen(f"http://localhost:{api_server_port}/api/health") as response: # nosec B310 exit_code = 0 if response.status == HTTPStatus.OK else 1 finally: sys.exit(exit_code) diff --git a/components/collector/pyproject.toml b/components/collector/pyproject.toml index 1b7c990e17..af41fa339d 100644 --- a/components/collector/pyproject.toml +++ b/components/collector/pyproject.toml @@ -33,7 +33,7 @@ optional-dependencies.tools = [ "mypy==1.10.1", "pip-audit==2.7.3", "pyproject-fmt==2.1.4", - "ruff==0.5.1", + "ruff==0.5.2", "vulture==2.11", ] diff --git a/components/frontend/package-lock.json b/components/frontend/package-lock.json index c954681566..387786a715 100644 --- a/components/frontend/package-lock.json +++ b/components/frontend/package-lock.json @@ -28,7 +28,7 @@ "devDependencies": { "@babel/plugin-proposal-private-property-in-object": "^7.21.11", "@eslint/compat": "^1.1.1", - "@eslint/js": "^9.6.0", + "@eslint/js": "^9.7.0", "@testing-library/dom": "10.3.1", "@testing-library/jest-dom": "^6.4.6", "@testing-library/react": "^16.0.0", @@ -39,10 +39,10 @@ "eslint-plugin-n": "^17.9.0", "eslint-plugin-prettier": "^5.1.3", "eslint-plugin-promise": "^6.4.0", - "eslint-plugin-react": "^7.34.3", + "eslint-plugin-react": "^7.34.4", "eslint-plugin-simple-import-sort": "^12.1.1", "globals": "^15.8.0", - "prettier": "^3.3.2", + "prettier": "^3.3.3", "react-scripts": "5.0.1" }, "engines": { @@ -2381,6 +2381,7 @@ "resolved": "https://registry.npmjs.org/@eslint/compat/-/compat-1.1.1.tgz", "integrity": "sha512-lpHyRyplhGPL5mGEh6M9O5nnKk0Gz4bFI+Zu6tKlPpDUN7XshWvH9C/px4UVm87IAANE0W81CEsNGbS1KlzXpA==", "dev": true, + "license": "Apache-2.0", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } @@ -2439,9 +2440,9 @@ } }, "node_modules/@eslint/js": { - "version": "9.6.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.6.0.tgz", - "integrity": "sha512-D9B0/3vNg44ZeWbYMpBoXqNP4j6eQD5vNwIlGAuFRRzK/WtT/jvDQW3Bi9kkf3PMDMlM7Yi+73VLUsn5bJcl8A==", + "version": "9.7.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.7.0.tgz", + "integrity": "sha512-ChuWDQenef8OSFnvuxv0TCVxEwmu3+hPNKvM9B34qpM0rDRbjL8t5QkQeHHeAfsKQjuH9wS82WeCi1J/owatng==", "dev": true, "license": "MIT", "engines": { @@ -9461,9 +9462,9 @@ } }, "node_modules/eslint-plugin-react": { - "version": "7.34.3", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.34.3.tgz", - "integrity": "sha512-aoW4MV891jkUulwDApQbPYTVZmeuSyFrudpbTAQuj5Fv8VL+o6df2xIGpw8B0hPjAaih1/Fb0om9grCdyFYemA==", + "version": "7.34.4", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.34.4.tgz", + "integrity": "sha512-Np+jo9bUwJNxCsT12pXtrGhJgT3T44T1sHhn1Ssr42XFn8TES0267wPGo5nNrMHi8qkyimDAX2BUmkf9pSaVzA==", "dev": true, "license": "MIT", "dependencies": { @@ -9475,16 +9476,17 @@ "doctrine": "^2.1.0", "es-iterator-helpers": "^1.0.19", "estraverse": "^5.3.0", + "hasown": "^2.0.2", "jsx-ast-utils": "^2.4.1 || ^3.0.0", "minimatch": "^3.1.2", "object.entries": "^1.1.8", "object.fromentries": "^2.0.8", - "object.hasown": "^1.1.4", "object.values": "^1.2.0", "prop-types": "^15.8.1", "resolve": "^2.0.0-next.5", "semver": "^6.3.1", - "string.prototype.matchall": "^4.0.11" + "string.prototype.matchall": "^4.0.11", + "string.prototype.repeat": "^1.0.0" }, "engines": { "node": ">=4" @@ -17082,24 +17084,6 @@ "node": ">= 0.4" } }, - "node_modules/object.hasown": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.4.tgz", - "integrity": "sha512-FZ9LZt9/RHzGySlBARE3VF+gE26TxR38SdmqOqliuTnl9wrKulaQs+4dee1V+Io8VfxqzAfHu6YuRgUy8OHoTg==", - "dev": true, - "license": "MIT", - "dependencies": { - "define-properties": "^1.2.1", - "es-abstract": "^1.23.2", - "es-object-atoms": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/object.values": { "version": "1.2.0", "dev": true, @@ -18775,9 +18759,9 @@ } }, "node_modules/prettier": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.2.tgz", - "integrity": "sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz", + "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==", "dev": true, "license": "MIT", "bin": { @@ -22091,6 +22075,17 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/string.prototype.repeat": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/string.prototype.repeat/-/string.prototype.repeat-1.0.0.tgz", + "integrity": "sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==", + "dev": true, + "license": "MIT", + "dependencies": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5" + } + }, "node_modules/string.prototype.trim": { "version": "1.2.9", "dev": true, diff --git a/components/frontend/package.json b/components/frontend/package.json index 0bfc5858d7..96212273fd 100644 --- a/components/frontend/package.json +++ b/components/frontend/package.json @@ -47,7 +47,7 @@ "devDependencies": { "@babel/plugin-proposal-private-property-in-object": "^7.21.11", "@eslint/compat": "^1.1.1", - "@eslint/js": "^9.6.0", + "@eslint/js": "^9.7.0", "@testing-library/dom": "10.3.1", "@testing-library/jest-dom": "^6.4.6", "@testing-library/react": "^16.0.0", @@ -58,10 +58,10 @@ "eslint-plugin-n": "^17.9.0", "eslint-plugin-prettier": "^5.1.3", "eslint-plugin-promise": "^6.4.0", - "eslint-plugin-react": "^7.34.3", + "eslint-plugin-react": "^7.34.4", "eslint-plugin-simple-import-sort": "^12.1.1", "globals": "^15.8.0", - "prettier": "^3.3.2", + "prettier": "^3.3.3", "react-scripts": "5.0.1" }, "prettier": { diff --git a/components/frontend/src/widgets/WarningMessage.js b/components/frontend/src/widgets/WarningMessage.js index 0b0f3066b6..1c806b14a3 100644 --- a/components/frontend/src/widgets/WarningMessage.js +++ b/components/frontend/src/widgets/WarningMessage.js @@ -5,7 +5,7 @@ import { Message } from "../semantic_ui_react_wrappers" export function WarningMessage(props) { // Show a warning message if showIf is true or undefined const { showIf, ...messageProps } = props - return showIf ?? true ? : null + return (showIf ?? true) ? : null } WarningMessage.propTypes = { showIf: bool, diff --git a/components/notifier/pyproject.toml b/components/notifier/pyproject.toml index f908b19fda..ac93d759b4 100644 --- a/components/notifier/pyproject.toml +++ b/components/notifier/pyproject.toml @@ -26,7 +26,7 @@ optional-dependencies.tools = [ "mypy==1.10.1", "pip-audit==2.7.3", "pyproject-fmt==2.1.4", - "ruff==0.5.1", + "ruff==0.5.2", "vulture==2.11", ] diff --git a/components/shared_code/pyproject.toml b/components/shared_code/pyproject.toml index 9ad6ab5c7b..17c33aae77 100644 --- a/components/shared_code/pyproject.toml +++ b/components/shared_code/pyproject.toml @@ -30,7 +30,7 @@ optional-dependencies.tools = [ "pip-audit==2.7.3", "pydantic==2.8.2", # Needed because pipx needs to inject Pydantic into the mpyp venv, see ci/quality.sh "pyproject-fmt==2.1.4", - "ruff==0.5.1", + "ruff==0.5.2", "vulture==2.11", ] diff --git a/docs/pyproject.toml b/docs/pyproject.toml index 990bd133f3..3ae875c88a 100644 --- a/docs/pyproject.toml +++ b/docs/pyproject.toml @@ -29,7 +29,7 @@ optional-dependencies.tools = [ "pip-audit==2.7.3", "pydantic==2.8.2", # Needed because pipx needs to inject Pydantic into the mpyp venv, see ci/quality.sh "pyproject-fmt==2.1.4", - "ruff==0.5.1", + "ruff==0.5.2", "vale==3.0.3.0", # Documentation grammar and style checker "vulture==2.11", ] diff --git a/release/pyproject.toml b/release/pyproject.toml index 1ef652fbc0..757fdceeb3 100644 --- a/release/pyproject.toml +++ b/release/pyproject.toml @@ -21,7 +21,7 @@ optional-dependencies.tools = [ "mypy==1.10.1", "pip-audit==2.7.3", "pyproject-fmt==2.1.4", - "ruff==0.5.1", + "ruff==0.5.2", "vulture==2.11", ] diff --git a/tests/application_tests/pyproject.toml b/tests/application_tests/pyproject.toml index 0b0d457d59..f6e4f6df7f 100644 --- a/tests/application_tests/pyproject.toml +++ b/tests/application_tests/pyproject.toml @@ -15,7 +15,7 @@ optional-dependencies.dev = [ "pip==24.1.2", "pip-tools==7.4.1", # To add hashes to requirements "pipx==1.6.0", - "types-requests==2.32.0.20240622", + "types-requests==2.32.0.20240712", ] optional-dependencies.tools = [ "bandit==1.7.9", @@ -23,7 +23,7 @@ optional-dependencies.tools = [ "mypy==1.10.1", "pip-audit==2.7.3", "pyproject-fmt==2.1.4", - "ruff==0.5.1", + "ruff==0.5.2", "vulture==2.11", ] diff --git a/tests/application_tests/requirements/requirements-dev.txt b/tests/application_tests/requirements/requirements-dev.txt index 2b4dcf27d6..954873493b 100644 --- a/tests/application_tests/requirements/requirements-dev.txt +++ b/tests/application_tests/requirements/requirements-dev.txt @@ -210,9 +210,9 @@ trio-websocket==0.11.1 \ --hash=sha256:18c11793647703c158b1f6e62de638acada927344d534e3c7628eedcb746839f \ --hash=sha256:520d046b0d030cf970b8b2b2e00c4c2245b3807853ecd44214acd33d74581638 # via selenium -types-requests==2.32.0.20240622 \ - --hash=sha256:97bac6b54b5bd4cf91d407e62f0932a74821bc2211f22116d9ee1dd643826caf \ - --hash=sha256:ed5e8a412fcc39159d6319385c009d642845f250c63902718f605cd90faade31 +types-requests==2.32.0.20240712 \ + --hash=sha256:90c079ff05e549f6bf50e02e910210b98b8ff1ebdd18e19c873cd237737c1358 \ + --hash=sha256:f754283e152c752e46e70942fa2a146b5bc70393522257bb85bd1ef7e019dcc3 # via application-tests (pyproject.toml) typing-extensions==4.12.2 \ --hash=sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d \ diff --git a/tests/feature_tests/pyproject.toml b/tests/feature_tests/pyproject.toml index 3bc4eb0af1..e50fd6335e 100644 --- a/tests/feature_tests/pyproject.toml +++ b/tests/feature_tests/pyproject.toml @@ -19,7 +19,7 @@ optional-dependencies.dev = [ "pip==24.1.2", "pip-tools==7.4.1", # To add hashes to requirements "pipx==1.6.0", - "types-requests==2.32.0.20240622", + "types-requests==2.32.0.20240712", "unittest-xml-reporting==3.2.0", # Needed to generate JUnit XML output for Sonarcloud.io ] optional-dependencies.tools = [ @@ -28,7 +28,7 @@ optional-dependencies.tools = [ "mypy==1.10.1", "pip-audit==2.7.3", "pyproject-fmt==2.1.4", - "ruff==0.5.1", + "ruff==0.5.2", "vulture==2.11", ] diff --git a/tests/feature_tests/requirements/requirements-dev.txt b/tests/feature_tests/requirements/requirements-dev.txt index 2e797e1850..1f7d1e82c8 100644 --- a/tests/feature_tests/requirements/requirements-dev.txt +++ b/tests/feature_tests/requirements/requirements-dev.txt @@ -533,9 +533,9 @@ six==1.16.0 \ # via # behave # parse-type -types-requests==2.32.0.20240622 \ - --hash=sha256:97bac6b54b5bd4cf91d407e62f0932a74821bc2211f22116d9ee1dd643826caf \ - --hash=sha256:ed5e8a412fcc39159d6319385c009d642845f250c63902718f605cd90faade31 +types-requests==2.32.0.20240712 \ + --hash=sha256:90c079ff05e549f6bf50e02e910210b98b8ff1ebdd18e19c873cd237737c1358 \ + --hash=sha256:f754283e152c752e46e70942fa2a146b5bc70393522257bb85bd1ef7e019dcc3 # via feature-tests (pyproject.toml) typing-extensions==4.12.2 \ --hash=sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d \