Skip to content

Commit 2bb9632

Browse files
committed
Merge branch 'branch-25.06' into branch-25.10-merge-branch-25.06
Signed-off-by: David Gardner <dagardner@nvidia.com>
2 parents 5a23a44 + 3bbd5e8 commit 2bb9632

19 files changed

+34
-27
lines changed

ci/conda/recipes/morpheus-core/meta.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-FileCopyrightText: Copyright (c) 2022-2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
1+
# SPDX-FileCopyrightText: Copyright (c) 2022-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -73,7 +73,7 @@ outputs:
7373
- &mlflow mlflow>=2.18
7474
- &mrc mrc {{ minor_version }}
7575
- nlohmann_json 3.11.*
76-
- pip
76+
- pip=25.2 # We currently depend on deprecated pip functionality which was removed in pip v25.3 #2053
7777
- pybind11-stubgen 0.10.5
7878
- python {{ python }}
7979
- rapidjson 1.1.0

ci/conda/recipes/morpheus-dfp/meta.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-FileCopyrightText: Copyright (c) 2022-2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
1+
# SPDX-FileCopyrightText: Copyright (c) 2022-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -56,7 +56,7 @@ outputs:
5656
- cuda-cudart-dev {{ cuda_compiler_version }}.*
5757
- cuda-version {{ cuda_compiler_version }}.*
5858
- morpheus-core={{ version }}=cuda_{{ cuda_compiler_version }}_py{{ python }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
59-
- pip
59+
- pip=25.2 # We currently depend on deprecated pip functionality which was removed in pip v25.3 #2053
6060
- python {{ python }}
6161
- scikit-build 0.17.6
6262
# We are currently depending on some deprecated functionality removed in setuptools 80+ #2224

ci/conda/recipes/morpheus-llm/meta.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-FileCopyrightText: Copyright (c) 2022-2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
1+
# SPDX-FileCopyrightText: Copyright (c) 2022-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -58,7 +58,7 @@ outputs:
5858
- morpheus-core={{ version }}=cuda_{{ cuda_compiler_version }}_py{{ python }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
5959
- cython 3.0.*
6060
- glog >=0.7.1,<0.8
61-
- pip
61+
- pip=25.2 # We currently depend on deprecated pip functionality which was removed in pip v25.3 #2053
6262
- pybind11-stubgen 0.10.5
6363
- python {{ python }}
6464
- rapidjson 1.1.0

ci/conda/recipes/morpheus/meta.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-FileCopyrightText: Copyright (c) 2022-2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
1+
# SPDX-FileCopyrightText: Copyright (c) 2022-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -75,7 +75,7 @@ outputs:
7575
- librdkafka =2.6.1
7676
- mrc {{ minor_version }}
7777
- nlohmann_json 3.11.*
78-
- pip
78+
- pip=25.2 # We currently depend on deprecated pip functionality which was removed in pip v25.3 #2053
7979
- pybind11-stubgen 0.10.5
8080
- python {{ python }}
8181
- rapidjson 1.1.0

ci/scripts/github/checks.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# SPDX-FileCopyrightText: Copyright (c) 2022-2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
2+
# SPDX-FileCopyrightText: Copyright (c) 2022-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
33
# SPDX-License-Identifier: Apache-2.0
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -49,9 +49,9 @@ cmake --build ${BUILD_DIR} --parallel ${PARALLEL_LEVEL}
4949
log_sccache_stats
5050

5151
rapids-logger "Installing Morpheus"
52-
pip install ./python/morpheus
53-
pip install ./python/morpheus_llm
54-
pip install ./python/morpheus_dfp
52+
pip install --no-build-isolation ./python/morpheus
53+
pip install --no-build-isolation ./python/morpheus_llm
54+
pip install --no-build-isolation ./python/morpheus_dfp
5555

5656
rapids-logger "Checking copyright headers"
5757
python ${MORPHEUS_ROOT}/ci/scripts/copyright.py --verify-apache-v2 --git-diff-commits ${CHANGE_TARGET} ${GIT_COMMIT}

ci/scripts/github/docs.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# SPDX-FileCopyrightText: Copyright (c) 2022-2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
2+
# SPDX-FileCopyrightText: Copyright (c) 2022-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
33
# SPDX-License-Identifier: Apache-2.0
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -31,9 +31,9 @@ download_artifact "wheel-${REAL_ARCH}.tar.bz"
3131

3232
tar xf "${WORKSPACE_TMP}/wheel-${REAL_ARCH}.tar.bz"
3333

34-
pip install ${MORPHEUS_ROOT}/${BUILD_DIR}/python/morpheus/dist/*.whl
35-
pip install ${MORPHEUS_ROOT}/${BUILD_DIR}/python/morpheus_llm/dist/*.whl
36-
pip install ${MORPHEUS_ROOT}/${BUILD_DIR}/python/morpheus_dfp/dist/*.whl
34+
pip install --no-build-isolation ${MORPHEUS_ROOT}/${BUILD_DIR}/python/morpheus/dist/*.whl
35+
pip install --no-build-isolation ${MORPHEUS_ROOT}/${BUILD_DIR}/python/morpheus_llm/dist/*.whl
36+
pip install --no-build-isolation ${MORPHEUS_ROOT}/${BUILD_DIR}/python/morpheus_dfp/dist/*.whl
3737

3838
rapids-logger "Pulling LFS assets"
3939
cd ${MORPHEUS_ROOT}

conda/environments/all_cuda-128_arch-aarch64.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ dependencies:
8585
- openai==1.13.*
8686
- papermill=2.6.0
8787
- pip
88+
- pip=25.2
8889
- pkg-config=0.29
8990
- pluggy=1.3
9091
- pre-commit

conda/environments/all_cuda-128_arch-x86_64.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ dependencies:
8787
- openai==1.13.*
8888
- papermill=2.6.0
8989
- pip
90+
- pip=25.2
9091
- pkg-config=0.29
9192
- pluggy=1.3
9293
- pre-commit

conda/environments/dev_cuda-128_arch-aarch64.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ dependencies:
6868
- numba=0.60.0
6969
- numpydoc=1.5
7070
- pip
71+
- pip=25.2
7172
- pkg-config=0.29
7273
- pluggy=1.3
7374
- pre-commit

conda/environments/dev_cuda-128_arch-x86_64.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ dependencies:
6969
- numba=0.60.0
7070
- numpydoc=1.5
7171
- pip
72+
- pip=25.2
7273
- pkg-config=0.29
7374
- pluggy=1.3
7475
- pre-commit

0 commit comments

Comments
 (0)