diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index be5909bcf8..74315de48a 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -113,6 +113,9 @@ sed_runner "s/${CURRENT_SHORT_TAG}/${NEXT_SHORT_TAG}/g" docs/source/getting_star sed_runner "s|blob/branch-${CURRENT_SHORT_TAG}|blob/branch-${NEXT_SHORT_TAG}|g" models/model-cards/*.md sed_runner "s|tree/branch-${CURRENT_SHORT_TAG}|tree/branch-${NEXT_SHORT_TAG}|g" models/model-cards/*.md +# thirdparty +sed_runner "s|tree/branch-${CURRENT_SHORT_TAG}|tree/branch-${NEXT_SHORT_TAG}|g" thirdparty/README.md + # Update the version of the Morpheus model container # We need to update several files, however we need to avoid symlinks as well as the build and .cache directories DOCS_MD_FILES=$(find -P ./docs/source/ -type f -iname "*.md") diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml index 6195edb574..32d7f8f505 100644 --- a/conda/environments/all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/all_cuda-125_arch-x86_64.yaml @@ -66,7 +66,7 @@ dependencies: - libtool - libwebp=1.3.2 - libzlib >=1.3.1,<2 -- mlflow +- mlflow>=2.10.0,<2.18 - mrc=25.02 - myst-parser=0.18.1 - nbsphinx diff --git a/conda/environments/dev_cuda-125_arch-x86_64.yaml b/conda/environments/dev_cuda-125_arch-x86_64.yaml index 0bb8977635..a2eae2afab 100644 --- a/conda/environments/dev_cuda-125_arch-x86_64.yaml +++ b/conda/environments/dev_cuda-125_arch-x86_64.yaml @@ -56,7 +56,7 @@ dependencies: - libtool - libwebp=1.3.2 - libzlib >=1.3.1,<2 -- mlflow +- mlflow>=2.10.0,<2.18 - mrc=25.02 - myst-parser=0.18.1 - nbsphinx diff --git a/conda/environments/examples_cuda-125_arch-x86_64.yaml b/conda/environments/examples_cuda-125_arch-x86_64.yaml index 3844c3b7b7..0ffb592b7d 100644 --- a/conda/environments/examples_cuda-125_arch-x86_64.yaml +++ b/conda/environments/examples_cuda-125_arch-x86_64.yaml @@ -29,7 +29,7 @@ dependencies: - jsonpatch>=1.33 - kfp - libwebp=1.3.2 -- mlflow +- mlflow>=2.10.0,<2.18 - mrc=25.02 - networkx=2.8.8 - newspaper3k=0.2 diff --git a/conda/environments/runtime_cuda-125_arch-x86_64.yaml b/conda/environments/runtime_cuda-125_arch-x86_64.yaml index b3f9824f16..d1086eb844 100644 --- a/conda/environments/runtime_cuda-125_arch-x86_64.yaml +++ b/conda/environments/runtime_cuda-125_arch-x86_64.yaml @@ -26,7 +26,7 @@ dependencies: - grpcio - grpcio-status - libwebp=1.3.2 -- mlflow +- mlflow>=2.10.0,<2.18 - mrc=25.02 - networkx=2.8.8 - numpydoc=1.5 diff --git a/dependencies.yaml b/dependencies.yaml index c237792d2a..e625b1971f 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -376,7 +376,7 @@ dependencies: - grpcio - grpcio-status # - libwebp=1.3.2 # Required for CVE mitigation: https://nvd.nist.gov/vuln/detail/CVE-2023-4863 ## - - mlflow #>=2.10.0,<3 + - mlflow>=2.10.0,<2.18 # Pin version to avoid breaking change in 2.18 to thread local variable code commit id: 5541888 - mrc=25.02 - networkx=2.8.8 - numpydoc=1.5 diff --git a/docker/Dockerfile b/docker/Dockerfile index 5fa06726de..929d4fd005 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -363,6 +363,7 @@ COPY --from=git_clone "/tmp/morpheus_repo/examples" "./examples" COPY --from=git_clone "/tmp/morpheus_repo/scripts" "./scripts" COPY --from=git_clone "/tmp/morpheus_repo/*.md" "./" COPY --from=git_clone "/tmp/morpheus_repo/LICENSE" "./" +COPY --from=git_clone "/tmp/morpheus_repo/thirdparty" "./thirdparty" RUN /opt/conda/bin/conda clean -afy && \ # Ensure the conda-bld directory is indexed even if empty diff --git a/thirdparty/README.md b/thirdparty/README.md new file mode 100644 index 0000000000..6180d7e97c --- /dev/null +++ b/thirdparty/README.md @@ -0,0 +1,20 @@ + + +# Source Code for OSS Packages in the NVIDIA Morpheus Docker container + +The source code for OSS packages which are included in the NVIDIA Morpheus Docker image is available at [https://github.com/nv-morpheus/morpheus_third_party_oss/tree/branch-25.02](https://github.com/nv-morpheus/morpheus_third_party_oss/tree/branch-25.02)