From 911bec16be282775a700695c91e087715e893cca Mon Sep 17 00:00:00 2001 From: FabrizioCafolla Date: Tue, 8 Apr 2025 15:26:47 +0000 Subject: [PATCH] feat: add uv to python feature --- src/python/devcontainer-feature.json | 2 +- src/python/install.sh | 2 +- test/python/alma-8-minimal.sh | 2 ++ test/python/alma-8.sh | 2 ++ test/python/alma-9-minimal.sh | 2 ++ test/python/alma-9.sh | 2 ++ test/python/centos-7.sh | 2 ++ test/python/fedora.sh | 2 ++ test/python/install_additional_python.sh | 2 ++ test/python/install_additional_python_rhel_family.sh | 2 ++ test/python/install_alternate_tools.sh | 2 ++ test/python/install_alternate_tools_rhel_family.sh | 2 ++ test/python/install_os_provided_python_deb.sh | 2 ++ test/python/install_os_provided_python_mariner.sh | 2 ++ test/python/install_os_provided_python_rhel_family.sh | 2 ++ test/python/install_python310_setuptools_vulnerability.sh | 2 ++ .../install_python310_skipVulnerabilityPatching_true.sh | 2 ++ test/python/install_python311_setuptools_vulnerability.sh | 2 ++ test/python/install_python_3_12.sh | 2 ++ test/python/install_python_shared_lib_deb.sh | 2 ++ test/python/install_python_shared_lib_rhel_family.sh | 2 ++ test/python/install_via_oryx.sh | 2 ++ test/python/scenarios.json | 4 ++-- test/python/test.sh | 2 ++ 24 files changed, 46 insertions(+), 4 deletions(-) diff --git a/src/python/devcontainer-feature.json b/src/python/devcontainer-feature.json index 635b233cf..5d82bc321 100644 --- a/src/python/devcontainer-feature.json +++ b/src/python/devcontainer-feature.json @@ -29,7 +29,7 @@ }, "toolsToInstall": { "type": "string", - "default": "flake8,autopep8,black,yapf,mypy,pydocstyle,pycodestyle,bandit,pipenv,virtualenv,pytest,pylint", + "default": "flake8,autopep8,black,yapf,mypy,pydocstyle,pycodestyle,bandit,pipenv,virtualenv,pytest,pylint,uv", "description": "Comma-separated list of tools to install when 'installTools' is true. Defaults to a set of common Python tools like pylint." }, "optimize": { diff --git a/src/python/install.sh b/src/python/install.sh index fec8937a0..de98cf5ed 100755 --- a/src/python/install.sh +++ b/src/python/install.sh @@ -29,7 +29,7 @@ CONFIGURE_JUPYTERLAB_ALLOW_ORIGIN="${CONFIGUREJUPYTERLABALLOWORIGIN:-""}" ADDITIONAL_VERSIONS="${ADDITIONALVERSIONS:-""}" # Comma-separated list of additional tools to be installed via pipx. -IFS="," read -r -a DEFAULT_UTILS <<< "${TOOLSTOINSTALL:-flake8,autopep8,black,yapf,mypy,pydocstyle,pycodestyle,bandit,pipenv,virtualenv,pytest}" +IFS="," read -r -a DEFAULT_UTILS <<< "${TOOLSTOINSTALL:-flake8,autopep8,black,yapf,mypy,pydocstyle,pycodestyle,bandit,pipenv,virtualenv,pytest,uv}" PYTHON_SOURCE_GPG_KEYS="64E628F8D684696D B26995E310250568 2D347EA6AA65421D FB9921286F5E1540 3A5CA953F73C700D 04C367C218ADD4FF 0EDDC5F26A45C816 6AF053F07D9DC8D2 C9BE28DEE6DF025C 126EB563A74B06BF D9866941EA5BBD71 ED9D77D5 A821E680E5FA6305" diff --git a/test/python/alma-8-minimal.sh b/test/python/alma-8-minimal.sh index 038826d5c..ecec8e486 100755 --- a/test/python/alma-8-minimal.sh +++ b/test/python/alma-8-minimal.sh @@ -21,6 +21,7 @@ check "pycodestyle" pycodestyle --version check "pydocstyle" pydocstyle --version check "pylint" pylint --version check "pytest" pytest --version +check "uv" uv --version # Check paths in settings check "current symlink is correct" bash -c "which python | grep /usr/local/python/current/bin/python" @@ -35,6 +36,7 @@ check "which pycodestyle" bash -c "which pycodestyle | grep /usr/local/py-utils/ check "which pydocstyle" bash -c "which pydocstyle | grep /usr/local/py-utils/bin/pydocstyle" check "which pylint" bash -c "which pylint | grep /usr/local/py-utils/bin/pylint" check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest" +check "which uv" bash -c "which uv | grep /usr/local/py-utils/bin/uv" # Report result reportResults diff --git a/test/python/alma-8.sh b/test/python/alma-8.sh index 038826d5c..ecec8e486 100755 --- a/test/python/alma-8.sh +++ b/test/python/alma-8.sh @@ -21,6 +21,7 @@ check "pycodestyle" pycodestyle --version check "pydocstyle" pydocstyle --version check "pylint" pylint --version check "pytest" pytest --version +check "uv" uv --version # Check paths in settings check "current symlink is correct" bash -c "which python | grep /usr/local/python/current/bin/python" @@ -35,6 +36,7 @@ check "which pycodestyle" bash -c "which pycodestyle | grep /usr/local/py-utils/ check "which pydocstyle" bash -c "which pydocstyle | grep /usr/local/py-utils/bin/pydocstyle" check "which pylint" bash -c "which pylint | grep /usr/local/py-utils/bin/pylint" check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest" +check "which uv" bash -c "which uv | grep /usr/local/py-utils/bin/uv" # Report result reportResults diff --git a/test/python/alma-9-minimal.sh b/test/python/alma-9-minimal.sh index 038826d5c..ecec8e486 100755 --- a/test/python/alma-9-minimal.sh +++ b/test/python/alma-9-minimal.sh @@ -21,6 +21,7 @@ check "pycodestyle" pycodestyle --version check "pydocstyle" pydocstyle --version check "pylint" pylint --version check "pytest" pytest --version +check "uv" uv --version # Check paths in settings check "current symlink is correct" bash -c "which python | grep /usr/local/python/current/bin/python" @@ -35,6 +36,7 @@ check "which pycodestyle" bash -c "which pycodestyle | grep /usr/local/py-utils/ check "which pydocstyle" bash -c "which pydocstyle | grep /usr/local/py-utils/bin/pydocstyle" check "which pylint" bash -c "which pylint | grep /usr/local/py-utils/bin/pylint" check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest" +check "which uv" bash -c "which uv | grep /usr/local/py-utils/bin/uv" # Report result reportResults diff --git a/test/python/alma-9.sh b/test/python/alma-9.sh index 038826d5c..ecec8e486 100755 --- a/test/python/alma-9.sh +++ b/test/python/alma-9.sh @@ -21,6 +21,7 @@ check "pycodestyle" pycodestyle --version check "pydocstyle" pydocstyle --version check "pylint" pylint --version check "pytest" pytest --version +check "uv" uv --version # Check paths in settings check "current symlink is correct" bash -c "which python | grep /usr/local/python/current/bin/python" @@ -35,6 +36,7 @@ check "which pycodestyle" bash -c "which pycodestyle | grep /usr/local/py-utils/ check "which pydocstyle" bash -c "which pydocstyle | grep /usr/local/py-utils/bin/pydocstyle" check "which pylint" bash -c "which pylint | grep /usr/local/py-utils/bin/pylint" check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest" +check "which uv" bash -c "which uv | grep /usr/local/py-utils/bin/uv" # Report result reportResults diff --git a/test/python/centos-7.sh b/test/python/centos-7.sh index 038826d5c..ecec8e486 100755 --- a/test/python/centos-7.sh +++ b/test/python/centos-7.sh @@ -21,6 +21,7 @@ check "pycodestyle" pycodestyle --version check "pydocstyle" pydocstyle --version check "pylint" pylint --version check "pytest" pytest --version +check "uv" uv --version # Check paths in settings check "current symlink is correct" bash -c "which python | grep /usr/local/python/current/bin/python" @@ -35,6 +36,7 @@ check "which pycodestyle" bash -c "which pycodestyle | grep /usr/local/py-utils/ check "which pydocstyle" bash -c "which pydocstyle | grep /usr/local/py-utils/bin/pydocstyle" check "which pylint" bash -c "which pylint | grep /usr/local/py-utils/bin/pylint" check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest" +check "which uv" bash -c "which uv | grep /usr/local/py-utils/bin/uv" # Report result reportResults diff --git a/test/python/fedora.sh b/test/python/fedora.sh index 038826d5c..ecec8e486 100755 --- a/test/python/fedora.sh +++ b/test/python/fedora.sh @@ -21,6 +21,7 @@ check "pycodestyle" pycodestyle --version check "pydocstyle" pydocstyle --version check "pylint" pylint --version check "pytest" pytest --version +check "uv" uv --version # Check paths in settings check "current symlink is correct" bash -c "which python | grep /usr/local/python/current/bin/python" @@ -35,6 +36,7 @@ check "which pycodestyle" bash -c "which pycodestyle | grep /usr/local/py-utils/ check "which pydocstyle" bash -c "which pydocstyle | grep /usr/local/py-utils/bin/pydocstyle" check "which pylint" bash -c "which pylint | grep /usr/local/py-utils/bin/pylint" check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest" +check "which uv" bash -c "which uv | grep /usr/local/py-utils/bin/uv" # Report result reportResults diff --git a/test/python/install_additional_python.sh b/test/python/install_additional_python.sh index d584f4be9..339b08132 100755 --- a/test/python/install_additional_python.sh +++ b/test/python/install_additional_python.sh @@ -22,6 +22,7 @@ check "pycodestyle" pycodestyle --version check "pydocstyle" pydocstyle --version check "pylint" pylint --version check "pytest" pytest --version +check "uv" uv --version # Check paths in settings check "current symlink is correct" bash -c "which python | grep /usr/local/python/current/bin/python" @@ -36,6 +37,7 @@ check "which pycodestyle" bash -c "which pycodestyle | grep /usr/local/py-utils/ check "which pydocstyle" bash -c "which pydocstyle | grep /usr/local/py-utils/bin/pydocstyle" check "which pylint" bash -c "which pylint | grep /usr/local/py-utils/bin/pylint" check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest" +check "which uv" bash -c "which uv | grep /usr/local/py-utils/bin/uv" # Report result reportResults diff --git a/test/python/install_additional_python_rhel_family.sh b/test/python/install_additional_python_rhel_family.sh index d584f4be9..339b08132 100644 --- a/test/python/install_additional_python_rhel_family.sh +++ b/test/python/install_additional_python_rhel_family.sh @@ -22,6 +22,7 @@ check "pycodestyle" pycodestyle --version check "pydocstyle" pydocstyle --version check "pylint" pylint --version check "pytest" pytest --version +check "uv" uv --version # Check paths in settings check "current symlink is correct" bash -c "which python | grep /usr/local/python/current/bin/python" @@ -36,6 +37,7 @@ check "which pycodestyle" bash -c "which pycodestyle | grep /usr/local/py-utils/ check "which pydocstyle" bash -c "which pydocstyle | grep /usr/local/py-utils/bin/pydocstyle" check "which pylint" bash -c "which pylint | grep /usr/local/py-utils/bin/pylint" check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest" +check "which uv" bash -c "which uv | grep /usr/local/py-utils/bin/uv" # Report result reportResults diff --git a/test/python/install_alternate_tools.sh b/test/python/install_alternate_tools.sh index b98d70997..3b792014d 100755 --- a/test/python/install_alternate_tools.sh +++ b/test/python/install_alternate_tools.sh @@ -15,6 +15,7 @@ check "bandit" bandit --version check "mypy" mypy --version check "pipenv" pipenv --version check "pytest" pytest --version +check "uv" uv --version check "ruff" ruff --version check "virtualenv" virtualenv --version @@ -25,6 +26,7 @@ check "which bandit" bash -c "which bandit | grep /usr/local/py-utils/bin/bandit check "which mypy" bash -c "which mypy | grep /usr/local/py-utils/bin/mypy" check "which pipenv" bash -c "which pipenv | grep /usr/local/py-utils/bin/pipenv" check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest" +check "which uv" bash -c "which uv | grep /usr/local/py-utils/bin/uv" check "which ruff" bash -c "which ruff | grep /usr/local/py-utils/bin/ruff" check "which virtualenv" bash -c "which virtualenv | grep /usr/local/py-utils/bin/virtualenv" diff --git a/test/python/install_alternate_tools_rhel_family.sh b/test/python/install_alternate_tools_rhel_family.sh index b98d70997..3b792014d 100644 --- a/test/python/install_alternate_tools_rhel_family.sh +++ b/test/python/install_alternate_tools_rhel_family.sh @@ -15,6 +15,7 @@ check "bandit" bandit --version check "mypy" mypy --version check "pipenv" pipenv --version check "pytest" pytest --version +check "uv" uv --version check "ruff" ruff --version check "virtualenv" virtualenv --version @@ -25,6 +26,7 @@ check "which bandit" bash -c "which bandit | grep /usr/local/py-utils/bin/bandit check "which mypy" bash -c "which mypy | grep /usr/local/py-utils/bin/mypy" check "which pipenv" bash -c "which pipenv | grep /usr/local/py-utils/bin/pipenv" check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest" +check "which uv" bash -c "which uv | grep /usr/local/py-utils/bin/uv" check "which ruff" bash -c "which ruff | grep /usr/local/py-utils/bin/ruff" check "which virtualenv" bash -c "which virtualenv | grep /usr/local/py-utils/bin/virtualenv" diff --git a/test/python/install_os_provided_python_deb.sh b/test/python/install_os_provided_python_deb.sh index e39b51412..c66815758 100755 --- a/test/python/install_os_provided_python_deb.sh +++ b/test/python/install_os_provided_python_deb.sh @@ -21,6 +21,7 @@ check "pycodestyle" pycodestyle --version check "pydocstyle" pydocstyle --version check "pylint" pylint --version check "pytest" pytest --version +check "uv" uv --version # Check paths in settings check "current symlink is correct" bash -c "which python | grep /usr/local/python/current/bin/python" @@ -35,6 +36,7 @@ check "which pycodestyle" bash -c "which pycodestyle | grep /usr/local/py-utils/ check "which pydocstyle" bash -c "which pydocstyle | grep /usr/local/py-utils/bin/pydocstyle" check "which pylint" bash -c "which pylint | grep /usr/local/py-utils/bin/pylint" check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest" +check "which uv" bash -c "which uv | grep /usr/local/py-utils/bin/uv" # Report result reportResults diff --git a/test/python/install_os_provided_python_mariner.sh b/test/python/install_os_provided_python_mariner.sh index e39b51412..c66815758 100755 --- a/test/python/install_os_provided_python_mariner.sh +++ b/test/python/install_os_provided_python_mariner.sh @@ -21,6 +21,7 @@ check "pycodestyle" pycodestyle --version check "pydocstyle" pydocstyle --version check "pylint" pylint --version check "pytest" pytest --version +check "uv" uv --version # Check paths in settings check "current symlink is correct" bash -c "which python | grep /usr/local/python/current/bin/python" @@ -35,6 +36,7 @@ check "which pycodestyle" bash -c "which pycodestyle | grep /usr/local/py-utils/ check "which pydocstyle" bash -c "which pydocstyle | grep /usr/local/py-utils/bin/pydocstyle" check "which pylint" bash -c "which pylint | grep /usr/local/py-utils/bin/pylint" check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest" +check "which uv" bash -c "which uv | grep /usr/local/py-utils/bin/uv" # Report result reportResults diff --git a/test/python/install_os_provided_python_rhel_family.sh b/test/python/install_os_provided_python_rhel_family.sh index e39b51412..c66815758 100644 --- a/test/python/install_os_provided_python_rhel_family.sh +++ b/test/python/install_os_provided_python_rhel_family.sh @@ -21,6 +21,7 @@ check "pycodestyle" pycodestyle --version check "pydocstyle" pydocstyle --version check "pylint" pylint --version check "pytest" pytest --version +check "uv" uv --version # Check paths in settings check "current symlink is correct" bash -c "which python | grep /usr/local/python/current/bin/python" @@ -35,6 +36,7 @@ check "which pycodestyle" bash -c "which pycodestyle | grep /usr/local/py-utils/ check "which pydocstyle" bash -c "which pydocstyle | grep /usr/local/py-utils/bin/pydocstyle" check "which pylint" bash -c "which pylint | grep /usr/local/py-utils/bin/pylint" check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest" +check "which uv" bash -c "which uv | grep /usr/local/py-utils/bin/uv" # Report result reportResults diff --git a/test/python/install_python310_setuptools_vulnerability.sh b/test/python/install_python310_setuptools_vulnerability.sh index d097f2113..90774c93d 100644 --- a/test/python/install_python310_setuptools_vulnerability.sh +++ b/test/python/install_python310_setuptools_vulnerability.sh @@ -50,6 +50,7 @@ check "pycodestyle" pycodestyle --version check "pydocstyle" pydocstyle --version check "pylint" pylint --version check "pytest" pytest --version +check "uv" uv --version check "setuptools" pip list | grep setuptools # Check paths in settings @@ -63,6 +64,7 @@ check "which pycodestyle" bash -c "which pycodestyle | grep /usr/local/py-utils/ check "which pydocstyle" bash -c "which pydocstyle | grep /usr/local/py-utils/bin/pydocstyle" check "which pylint" bash -c "which pylint | grep /usr/local/py-utils/bin/pylint" check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest" +check "which uv" bash -c "which uv | grep /usr/local/py-utils/bin/uv" checkVulnerableFile_OR_DIR() { diff --git a/test/python/install_python310_skipVulnerabilityPatching_true.sh b/test/python/install_python310_skipVulnerabilityPatching_true.sh index a6d582e9d..75bccd4c2 100644 --- a/test/python/install_python310_skipVulnerabilityPatching_true.sh +++ b/test/python/install_python310_skipVulnerabilityPatching_true.sh @@ -50,6 +50,7 @@ check "pycodestyle" pycodestyle --version check "pydocstyle" pydocstyle --version check "pylint" pylint --version check "pytest" pytest --version +check "uv" uv --version check "setuptools" pip list | grep setuptools # Check paths in settings @@ -63,6 +64,7 @@ check "which pycodestyle" bash -c "which pycodestyle | grep /usr/local/py-utils/ check "which pydocstyle" bash -c "which pydocstyle | grep /usr/local/py-utils/bin/pydocstyle" check "which pylint" bash -c "which pylint | grep /usr/local/py-utils/bin/pylint" check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest" +check "which uv" bash -c "which uv | grep /usr/local/py-utils/bin/uv" HL="\033[1;33m" N="\033[0;37m" diff --git a/test/python/install_python311_setuptools_vulnerability.sh b/test/python/install_python311_setuptools_vulnerability.sh index 969c0ba8d..37814455f 100644 --- a/test/python/install_python311_setuptools_vulnerability.sh +++ b/test/python/install_python311_setuptools_vulnerability.sh @@ -51,6 +51,7 @@ check "pycodestyle" pycodestyle --version check "pydocstyle" pydocstyle --version check "pylint" pylint --version check "pytest" pytest --version +check "uv" uv --version check "setuptools" pip list | grep setuptools # Check paths in settings @@ -64,6 +65,7 @@ check "which pycodestyle" bash -c "which pycodestyle | grep /usr/local/py-utils/ check "which pydocstyle" bash -c "which pydocstyle | grep /usr/local/py-utils/bin/pydocstyle" check "which pylint" bash -c "which pylint | grep /usr/local/py-utils/bin/pylint" check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest" +check "which uv" bash -c "which uv | grep /usr/local/py-utils/bin/uv" checkVulnerableFile_OR_DIR() { diff --git a/test/python/install_python_3_12.sh b/test/python/install_python_3_12.sh index 2437aefe7..00ca8d2c3 100755 --- a/test/python/install_python_3_12.sh +++ b/test/python/install_python_3_12.sh @@ -19,6 +19,7 @@ check "pycodestyle" pycodestyle --version check "pydocstyle" pydocstyle --version check "pylint" pylint --version check "pytest" pytest --version +check "uv" uv --version # Check paths in settings check "current symlink is correct" bash -c "which python | grep /usr/local/python/current/bin/python" @@ -33,6 +34,7 @@ check "which pycodestyle" bash -c "which pycodestyle | grep /usr/local/py-utils/ check "which pydocstyle" bash -c "which pydocstyle | grep /usr/local/py-utils/bin/pydocstyle" check "which pylint" bash -c "which pylint | grep /usr/local/py-utils/bin/pylint" check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest" +check "which uv" bash -c "which uv | grep /usr/local/py-utils/bin/uv" # Report result reportResults diff --git a/test/python/install_python_shared_lib_deb.sh b/test/python/install_python_shared_lib_deb.sh index ee16c436a..ba3c815e5 100755 --- a/test/python/install_python_shared_lib_deb.sh +++ b/test/python/install_python_shared_lib_deb.sh @@ -21,6 +21,7 @@ check "pycodestyle" pycodestyle --version check "pydocstyle" pydocstyle --version check "pylint" pylint --version check "pytest" pytest --version +check "uv" uv --version # Check paths in settings check "current symlink is correct" bash -c "which python | grep /usr/local/python/current/bin/python" @@ -35,6 +36,7 @@ check "which pycodestyle" bash -c "which pycodestyle | grep /usr/local/py-utils/ check "which pydocstyle" bash -c "which pydocstyle | grep /usr/local/py-utils/bin/pydocstyle" check "which pylint" bash -c "which pylint | grep /usr/local/py-utils/bin/pylint" check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest" +check "which uv" bash -c "which uv | grep /usr/local/py-utils/bin/uv" # Check compiled with "--enable-shared" -- python truth is opposite of the shells # therefore we negate the check to get a '0' exit code when the python diff --git a/test/python/install_python_shared_lib_rhel_family.sh b/test/python/install_python_shared_lib_rhel_family.sh index ee16c436a..ba3c815e5 100755 --- a/test/python/install_python_shared_lib_rhel_family.sh +++ b/test/python/install_python_shared_lib_rhel_family.sh @@ -21,6 +21,7 @@ check "pycodestyle" pycodestyle --version check "pydocstyle" pydocstyle --version check "pylint" pylint --version check "pytest" pytest --version +check "uv" uv --version # Check paths in settings check "current symlink is correct" bash -c "which python | grep /usr/local/python/current/bin/python" @@ -35,6 +36,7 @@ check "which pycodestyle" bash -c "which pycodestyle | grep /usr/local/py-utils/ check "which pydocstyle" bash -c "which pydocstyle | grep /usr/local/py-utils/bin/pydocstyle" check "which pylint" bash -c "which pylint | grep /usr/local/py-utils/bin/pylint" check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest" +check "which uv" bash -c "which uv | grep /usr/local/py-utils/bin/uv" # Check compiled with "--enable-shared" -- python truth is opposite of the shells # therefore we negate the check to get a '0' exit code when the python diff --git a/test/python/install_via_oryx.sh b/test/python/install_via_oryx.sh index e39b51412..c66815758 100755 --- a/test/python/install_via_oryx.sh +++ b/test/python/install_via_oryx.sh @@ -21,6 +21,7 @@ check "pycodestyle" pycodestyle --version check "pydocstyle" pydocstyle --version check "pylint" pylint --version check "pytest" pytest --version +check "uv" uv --version # Check paths in settings check "current symlink is correct" bash -c "which python | grep /usr/local/python/current/bin/python" @@ -35,6 +36,7 @@ check "which pycodestyle" bash -c "which pycodestyle | grep /usr/local/py-utils/ check "which pydocstyle" bash -c "which pydocstyle | grep /usr/local/py-utils/bin/pydocstyle" check "which pylint" bash -c "which pylint | grep /usr/local/py-utils/bin/pylint" check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest" +check "which uv" bash -c "which uv | grep /usr/local/py-utils/bin/uv" # Report result reportResults diff --git a/test/python/scenarios.json b/test/python/scenarios.json index 9dc37e16c..86f30b57e 100644 --- a/test/python/scenarios.json +++ b/test/python/scenarios.json @@ -177,7 +177,7 @@ "features": { "python": { "version": "3.12", - "toolsToInstall": "ruff,mypy,bandit,pipenv,virtualenv,pytest" + "toolsToInstall": "ruff,mypy,bandit,pipenv,virtualenv,pytest,uv" } } }, @@ -186,7 +186,7 @@ "features": { "python": { "version": "3.12", - "toolsToInstall": "ruff,mypy,bandit,pipenv,virtualenv,pytest" + "toolsToInstall": "ruff,mypy,bandit,pipenv,virtualenv,pytest,uv" } } }, diff --git a/test/python/test.sh b/test/python/test.sh index 038826d5c..ecec8e486 100755 --- a/test/python/test.sh +++ b/test/python/test.sh @@ -21,6 +21,7 @@ check "pycodestyle" pycodestyle --version check "pydocstyle" pydocstyle --version check "pylint" pylint --version check "pytest" pytest --version +check "uv" uv --version # Check paths in settings check "current symlink is correct" bash -c "which python | grep /usr/local/python/current/bin/python" @@ -35,6 +36,7 @@ check "which pycodestyle" bash -c "which pycodestyle | grep /usr/local/py-utils/ check "which pydocstyle" bash -c "which pydocstyle | grep /usr/local/py-utils/bin/pydocstyle" check "which pylint" bash -c "which pylint | grep /usr/local/py-utils/bin/pylint" check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest" +check "which uv" bash -c "which uv | grep /usr/local/py-utils/bin/uv" # Report result reportResults