From 0fb87a2a0b29368da84813ab8237f8c6f6c07b03 Mon Sep 17 00:00:00 2001
From: David Gardner <dagardner@nvidia.com>
Date: Mon, 27 Jan 2025 09:37:11 -0800
Subject: [PATCH] Updating versions for v25.06.00

---
 .gitmodules                         | 2 +-
 CMakeLists.txt                      | 2 +-
 ci/release/update-version.sh        | 4 ++--
 docs/quickstart/CMakeLists.txt      | 2 +-
 docs/quickstart/environment_cpp.yml | 2 +-
 external/utilities                  | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 33329d570..25d6eb11c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "morpheus_utils"]
 	path = external/utilities
 	url = https://github.com/nv-morpheus/utilities.git
-	branch = branch-25.02
+	branch = branch-25.06
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 55e9f29ee..d11e24bb2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -79,7 +79,7 @@ morpheus_utils_initialize_package_manager(
 morpheus_utils_initialize_cuda_arch(mrc)
 
 project(mrc
-  VERSION 25.02.00
+  VERSION 25.06.00
   LANGUAGES C CXX
 )
 
diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh
index 9af069f68..dc826487a 100755
--- a/ci/release/update-version.sh
+++ b/ci/release/update-version.sh
@@ -48,8 +48,8 @@ NEXT_PATCH=$(echo ${NEXT_FULL_VERSION} | awk '{split($0, a, "."); print a[3]}')
 NEXT_SHORT_TAG=${NEXT_MAJOR}.${NEXT_MINOR}
 
 # Need to distutils-normalize the versions for some use cases
-CURRENT_SHORT_TAG_PEP440=$(python -c "from setuptools.extern import packaging; print(packaging.version.Version('${CURRENT_SHORT_TAG}'))")
-NEXT_SHORT_TAG_PEP440=$(python -c "from setuptools.extern import packaging; print(packaging.version.Version('${NEXT_SHORT_TAG}'))")
+CURRENT_SHORT_TAG_PEP440=$(python -c "from packaging import version; print(version.Version('${CURRENT_SHORT_TAG}'))")
+NEXT_SHORT_TAG_PEP440=$(python -c "from packaging import version; print(version.Version('${NEXT_SHORT_TAG}'))")
 
 echo "Preparing release $CURRENT_FULL_VERSION (PEP ${CURRENT_SHORT_TAG_PEP440}) => $NEXT_FULL_VERSION (PEP ${NEXT_SHORT_TAG_PEP440})"
 
diff --git a/docs/quickstart/CMakeLists.txt b/docs/quickstart/CMakeLists.txt
index 1762601c3..11e748af7 100644
--- a/docs/quickstart/CMakeLists.txt
+++ b/docs/quickstart/CMakeLists.txt
@@ -28,7 +28,7 @@ list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../external/utili
 include(morpheus_utils/load)
 
 project(mrc-quickstart
-  VERSION 25.02.00
+  VERSION 25.06.00
   LANGUAGES C CXX
 )
 
diff --git a/docs/quickstart/environment_cpp.yml b/docs/quickstart/environment_cpp.yml
index 3406d56f2..ca184a19c 100644
--- a/docs/quickstart/environment_cpp.yml
+++ b/docs/quickstart/environment_cpp.yml
@@ -30,7 +30,7 @@ dependencies:
   - pkg-config=0.29
   - python=3.10
   - scikit-build>=0.12
-  - mrc=25.02
+  - mrc=25.06
   - sysroot_linux-64>=2.28
   - pip:
     - cython
diff --git a/external/utilities b/external/utilities
index d97859b06..c57d0e964 160000
--- a/external/utilities
+++ b/external/utilities
@@ -1 +1 @@
-Subproject commit d97859b060e98d79bb568ca7a73f9c109dfad9cc
+Subproject commit c57d0e96482a8b8096467049aac08c180a3a51e0