diff --git a/src/universal/.devcontainer/devcontainer-lock.json b/src/universal/.devcontainer/devcontainer-lock.json index c678e53d7..2d0f6cdef 100644 --- a/src/universal/.devcontainer/devcontainer-lock.json +++ b/src/universal/.devcontainer/devcontainer-lock.json @@ -6,9 +6,9 @@ "integrity": "sha256:9ddad2e4f71f172cc0bf28461e70948218f70f8ad6cd936b5c8dbe0a8acf6b45" }, "ghcr.io/devcontainers/features/conda:1": { - "version": "1.0.10", - "resolved": "ghcr.io/devcontainers/features/conda@sha256:84207a9933d7739cb99731ab671eda3f07200ce1fb3dfdc261dc565dd68d168c", - "integrity": "sha256:84207a9933d7739cb99731ab671eda3f07200ce1fb3dfdc261dc565dd68d168c" + "version": "1.2.5", + "resolved": "ghcr.io/devcontainers/features/conda@sha256:d189cf17997854b28c7ffbab5db70f9b7d70332d97dfbf44447e48e958a03c8b", + "integrity": "sha256:d189cf17997854b28c7ffbab5db70f9b7d70332d97dfbf44447e48e958a03c8b" }, "ghcr.io/devcontainers/features/copilot-cli:1": { "version": "1.0.0", diff --git a/src/universal/test-project/test.sh b/src/universal/test-project/test.sh index 87fc36b2a..1e58c6b6c 100755 --- a/src/universal/test-project/test.sh +++ b/src/universal/test-project/test.sh @@ -183,7 +183,8 @@ checkPythonPackageVersion "python" "requests" "2.31.0" ## Python -alternative version 3.11. Must be removed when pinned version 3.11 is updated to a different python version. checkPythonPackageVersion "/usr/local/python/3.11.*/bin/python" "setuptools" "78.1.1" -check "pip-version-for-3.11" bash -c "/usr/local/python/3.11.*/bin/python -m pip --version | grep 25.3" +pip_version_3_11=$(/usr/local/python/3.11.*/bin/python -m pip --version) +check-version-ge "pip-version-for-3.11" "${pip_version_3_11}" "pip 25.3" ## Conda Python checkCondaPackageVersion "requests" "2.31.0" @@ -193,7 +194,7 @@ checkCondaPackageVersion "urllib3" "2.6.3" checkCondaPackageVersion "brotli" "1.2.0" ## Test Conda -check "conda-update-conda" bash -c "conda update -y conda" +check "conda-update-conda" bash -c "conda update -c defaults -y conda" check "conda-install-tensorflow" bash -c "conda create --name test-env -c conda-forge --yes tensorflow" check "conda-install-pytorch" bash -c "conda create --name test-env -c conda-forge --yes pytorch"