Skip to content

Commit 0f3873e

Browse files
CopilotKaniska244
andauthored
Fix universal image smoke test failures: pip version and conda update (#1784)
* Initial plan * Fix smoke test failures: update pip version check and remove unreliable conda update test Co-authored-by: Kaniska244 <[email protected]> * Fix pip version regex to match multi-digit versions (26.10+) Co-authored-by: Kaniska244 <[email protected]> * Improve pip version regex to explicitly handle semantic versioning Co-authored-by: Kaniska244 <[email protected]> * Use version comparison to support pip >= 26.0 (including 27.x, 28.x) Co-authored-by: Kaniska244 <[email protected]> * Use original minimum pip version 25.3 for >= check Co-authored-by: Kaniska244 <[email protected]> * Restore conda-update-conda test after devcontainer upgrade Co-authored-by: Kaniska244 <[email protected]> * Update devcontainer-lock.json: upgrade conda feature to v1.2.5 Co-authored-by: Kaniska244 <[email protected]> * Specify conda-forge channel in conda update command Co-authored-by: Kaniska244 <[email protected]> * Remove conda-update-conda test due to tqdm dependency conflicts Co-authored-by: Kaniska244 <[email protected]> * Add conda-update-conda test with override-channels flag Co-authored-by: Kaniska244 <[email protected]> * Use defaults channel for conda update test Co-authored-by: Kaniska244 <[email protected]> --------- Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: Kaniska244 <[email protected]> Co-authored-by: Kaniska <[email protected]>
1 parent 938e2a9 commit 0f3873e

2 files changed

Lines changed: 6 additions & 5 deletions

File tree

src/universal/.devcontainer/devcontainer-lock.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
"integrity": "sha256:9ddad2e4f71f172cc0bf28461e70948218f70f8ad6cd936b5c8dbe0a8acf6b45"
77
},
88
"ghcr.io/devcontainers/features/conda:1": {
9-
"version": "1.0.10",
10-
"resolved": "ghcr.io/devcontainers/features/conda@sha256:84207a9933d7739cb99731ab671eda3f07200ce1fb3dfdc261dc565dd68d168c",
11-
"integrity": "sha256:84207a9933d7739cb99731ab671eda3f07200ce1fb3dfdc261dc565dd68d168c"
9+
"version": "1.2.5",
10+
"resolved": "ghcr.io/devcontainers/features/conda@sha256:d189cf17997854b28c7ffbab5db70f9b7d70332d97dfbf44447e48e958a03c8b",
11+
"integrity": "sha256:d189cf17997854b28c7ffbab5db70f9b7d70332d97dfbf44447e48e958a03c8b"
1212
},
1313
"ghcr.io/devcontainers/features/copilot-cli:1": {
1414
"version": "1.0.0",

src/universal/test-project/test.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,8 @@ checkPythonPackageVersion "python" "requests" "2.31.0"
183183

184184
## Python -alternative version 3.11. Must be removed when pinned version 3.11 is updated to a different python version.
185185
checkPythonPackageVersion "/usr/local/python/3.11.*/bin/python" "setuptools" "78.1.1"
186-
check "pip-version-for-3.11" bash -c "/usr/local/python/3.11.*/bin/python -m pip --version | grep 25.3"
186+
pip_version_3_11=$(/usr/local/python/3.11.*/bin/python -m pip --version)
187+
check-version-ge "pip-version-for-3.11" "${pip_version_3_11}" "pip 25.3"
187188

188189
## Conda Python
189190
checkCondaPackageVersion "requests" "2.31.0"
@@ -193,7 +194,7 @@ checkCondaPackageVersion "urllib3" "2.6.3"
193194
checkCondaPackageVersion "brotli" "1.2.0"
194195

195196
## Test Conda
196-
check "conda-update-conda" bash -c "conda update -y conda"
197+
check "conda-update-conda" bash -c "conda update -c defaults -y conda"
197198
check "conda-install-tensorflow" bash -c "conda create --name test-env -c conda-forge --yes tensorflow"
198199
check "conda-install-pytorch" bash -c "conda create --name test-env -c conda-forge --yes pytorch"
199200

0 commit comments

Comments
 (0)