From 9169c7d998b187622c6f62ea004c79e541ce2ac2 Mon Sep 17 00:00:00 2001 From: hborcher Date: Tue, 19 May 2026 08:18:24 -0500 Subject: [PATCH 1/2] chore: update lockfile dependencies Updated urllib3 v2.6.3 -> v2.7.0 --- uv.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/uv.lock b/uv.lock index 9f78b4e..a57cb61 100644 --- a/uv.lock +++ b/uv.lock @@ -1794,11 +1794,11 @@ wheels = [ [[package]] name = "urllib3" -version = "2.6.3" +version = "2.7.0" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/c7/24/5f1b3bdffd70275f6661c76461e25f024d5a38a46f04aaca912426a2b1d3/urllib3-2.6.3.tar.gz", hash = "sha256:1b62b6884944a57dbe321509ab94fd4d3b307075e0c2eae991ac71ee15ad38ed", size = 435556, upload-time = "2026-01-07T16:24:43.925Z" } +sdist = { url = "https://files.pythonhosted.org/packages/53/0c/06f8b233b8fd13b9e5ee11424ef85419ba0d8ba0b3138bf360be2ff56953/urllib3-2.7.0.tar.gz", hash = "sha256:231e0ec3b63ceb14667c67be60f2f2c40a518cb38b03af60abc813da26505f4c", size = 433602, upload-time = "2026-05-07T16:13:18.596Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/39/08/aaaad47bc4e9dc8c725e68f9d04865dbcb2052843ff09c97b08904852d84/urllib3-2.6.3-py3-none-any.whl", hash = "sha256:bf272323e553dfb2e87d9bfd225ca7b0f467b919d7bbd355436d3fd37cb0acd4", size = 131584, upload-time = "2026-01-07T16:24:42.685Z" }, + { url = "https://files.pythonhosted.org/packages/7f/3e/5db95bcf282c52709639744ca2a8b149baccf648e39c8cc87553df9eae0c/urllib3-2.7.0-py3-none-any.whl", hash = "sha256:9fb4c81ebbb1ce9531cce37674bbc6f1360472bc18ca9a553ede278ef7276897", size = 131087, upload-time = "2026-05-07T16:13:17.151Z" }, ] [[package]] From 24de42a9480e5ae48a4246e9277011a4596690bd Mon Sep 17 00:00:00 2001 From: hborcher Date: Tue, 19 May 2026 08:23:00 -0500 Subject: [PATCH 2/2] ci: used pinned version of pysonar instead of using uvx Updated pysonar v1.0.2.1722 -> v1.5.0.4793 Removed responses v0.25.8 --- uv.lock | 22 +++------------------- vars/runJenkinsPipeline.groovy | 2 +- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/uv.lock b/uv.lock index a57cb61..d26a930 100644 --- a/uv.lock +++ b/uv.lock @@ -1196,19 +1196,17 @@ wheels = [ [[package]] name = "pysonar" -version = "1.0.2.1722" +version = "1.5.0.4793" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "jproperties" }, - { name = "pyfakefs" }, { name = "requests" }, - { name = "responses" }, { name = "tomli", version = "2.2.1", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.11'" }, { name = "tomli", version = "2.4.1", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.11'" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/dd/25/cb693cf80a3b6aa4c86f2f3ab59652be1280452d3c70c18823eec1024254/pysonar-1.0.2.1722.tar.gz", hash = "sha256:fc024f5172b97faca6c280284a67be1bfaf8d76f4f04e37f93c86b70042bac15", size = 24570, upload-time = "2025-05-28T11:44:00.295Z" } +sdist = { url = "https://files.pythonhosted.org/packages/f1/36/563d1e96dc7105b33d65cba2cc25df3eeb838aabd87a6e821051cce07c37/pysonar-1.5.0.4793.tar.gz", hash = "sha256:52791bcb8b01efd7dc203a5428f2b1b48b19269bc2982582d6e4e5f127716ac3", size = 28328, upload-time = "2026-04-30T12:38:40.371Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/c6/e8/ab475bfe152ec01ebd0508514267182ab84e45a73405df73f7fdda0f3f8c/pysonar-1.0.2.1722-py3-none-any.whl", hash = "sha256:abacede0e5f8ca1468ac644889e2e87e8adeae07718906fe4ad546f5feacbc5d", size = 36742, upload-time = "2025-05-28T11:43:59.056Z" }, + { url = "https://files.pythonhosted.org/packages/c3/9b/33b693c772e662d47bbde5890b939690e0ba9a5dff252bcd6e6ceae8285d/pysonar-1.5.0.4793-py3-none-any.whl", hash = "sha256:c55113e592562a5eddab6090c437cc60dde73e4cc6fea74b1292d438c62865d6", size = 42470, upload-time = "2026-04-30T12:38:39.464Z" }, ] [[package]] @@ -1357,20 +1355,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/3f/51/d4db610ef29373b879047326cbf6fa98b6c1969d6f6dc423279de2b1be2c/requests_toolbelt-1.0.0-py2.py3-none-any.whl", hash = "sha256:cccfdd665f0a24fcf4726e690f65639d272bb0637b9b92dfd91a5568ccf6bd06", size = 54481, upload-time = "2023-05-01T04:11:28.427Z" }, ] -[[package]] -name = "responses" -version = "0.25.8" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "pyyaml" }, - { name = "requests" }, - { name = "urllib3" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/0e/95/89c054ad70bfef6da605338b009b2e283485835351a9935c7bfbfaca7ffc/responses-0.25.8.tar.gz", hash = "sha256:9374d047a575c8f781b94454db5cab590b6029505f488d12899ddb10a4af1cf4", size = 79320, upload-time = "2025-08-08T19:01:46.709Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/1c/4c/cc276ce57e572c102d9542d383b2cfd551276581dc60004cb94fe8774c11/responses-0.25.8-py3-none-any.whl", hash = "sha256:0c710af92def29c8352ceadff0c3fe340ace27cf5af1bbe46fb71275bcd2831c", size = 34769, upload-time = "2025-08-08T19:01:45.018Z" }, -] - [[package]] name = "rfc3986" version = "2.0.0" diff --git a/vars/runJenkinsPipeline.groovy b/vars/runJenkinsPipeline.groovy index df4d7d7..9fa12d7 100644 --- a/vars/runJenkinsPipeline.groovy +++ b/vars/runJenkinsPipeline.groovy @@ -484,7 +484,7 @@ def call(){ withCredentials([string(credentialsId: params.SONARCLOUD_TOKEN, variable: 'token')]) { sh( label: 'Running Sonar Scanner', - script: "uvx pysonar -t \$token -Dsonar.projectVersion=${env.VERSION} -Dsonar.python.xunit.reportPath=./reports/tests/pytest/pytest-junit.xml -Dsonar.python.coverage.reportPaths=./reports/coverage.xml -Dsonar.python.ruff.reportPaths=./reports/ruffoutput.json -Dsonar.python.mypy.reportPaths=./logs/mypy.log ${env.CHANGE_ID ? '-Dsonar.pullrequest.key=$CHANGE_ID -Dsonar.pullrequest.base=$BRANCH_NAME' : '-Dsonar.branch.name=$BRANCH_NAME' }", + script: "uv run pysonar -t \$token -Dsonar.projectVersion=${env.VERSION} -Dsonar.python.xunit.reportPath=./reports/tests/pytest/pytest-junit.xml -Dsonar.python.coverage.reportPaths=./reports/coverage.xml -Dsonar.python.ruff.reportPaths=./reports/ruffoutput.json -Dsonar.python.mypy.reportPaths=./logs/mypy.log ${env.CHANGE_ID ? '-Dsonar.pullrequest.key=$CHANGE_ID -Dsonar.pullrequest.base=$BRANCH_NAME' : '-Dsonar.branch.name=$BRANCH_NAME' }", ) } }