From 4704477fdd3879838341a19e3da2c7940c975b35 Mon Sep 17 00:00:00 2001
From: Hyunsu Cho <phcho@nvidia.com>
Date: Mon, 29 Jan 2024 10:46:33 -0800
Subject: [PATCH 1/2] Disable hnswlib feature in RAFT

---
 cpp/cmake/thirdparty/get_raft.cmake | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cpp/cmake/thirdparty/get_raft.cmake b/cpp/cmake/thirdparty/get_raft.cmake
index 8919feb45d..7bc860eed8 100644
--- a/cpp/cmake/thirdparty/get_raft.cmake
+++ b/cpp/cmake/thirdparty/get_raft.cmake
@@ -1,5 +1,5 @@
 #=============================================================================
-# Copyright (c) 2021-2023, NVIDIA CORPORATION.
+# Copyright (c) 2021-2024, NVIDIA CORPORATION.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -65,6 +65,7 @@ function(find_and_configure_raft)
         OPTIONS
           "BUILD_TESTS OFF"
           "BUILD_BENCH OFF"
+          "BUILD_CAGRA_HNSWLIB OFF"
           "RAFT_COMPILE_LIBRARY ${PKG_COMPILE_LIBRARY}"
     )
 

From 326fa11b6d5d72750faeade49354d0f23aaacf7e Mon Sep 17 00:00:00 2001
From: Hyunsu Cho <phcho@nvidia.com>
Date: Mon, 29 Jan 2024 10:57:34 -0800
Subject: [PATCH 2/2] Pin Pytest to 7.x

---
 conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +-
 conda/environments/all_cuda-120_arch-x86_64.yaml | 2 +-
 dependencies.yaml                                | 2 +-
 python/pyproject.toml                            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
index 0af9ec2184..929bd9b94d 100644
--- a/conda/environments/all_cuda-118_arch-x86_64.yaml
+++ b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -53,11 +53,11 @@ dependencies:
 - pydata-sphinx-theme!=0.14.2
 - pylibraft==24.2.*
 - pynndescent==0.5.8
-- pytest
 - pytest-benchmark
 - pytest-cases
 - pytest-cov
 - pytest-xdist
+- pytest==7.*
 - python>=3.9,<3.11
 - raft-dask==24.2.*
 - rapids-dask-dependency==24.2.*
diff --git a/conda/environments/all_cuda-120_arch-x86_64.yaml b/conda/environments/all_cuda-120_arch-x86_64.yaml
index cb2c047dc3..1dad68e41a 100644
--- a/conda/environments/all_cuda-120_arch-x86_64.yaml
+++ b/conda/environments/all_cuda-120_arch-x86_64.yaml
@@ -49,11 +49,11 @@ dependencies:
 - pydata-sphinx-theme!=0.14.2
 - pylibraft==24.2.*
 - pynndescent==0.5.8
-- pytest
 - pytest-benchmark
 - pytest-cases
 - pytest-cov
 - pytest-xdist
+- pytest==7.*
 - python>=3.9,<3.11
 - raft-dask==24.2.*
 - rapids-dask-dependency==24.2.*
diff --git a/dependencies.yaml b/dependencies.yaml
index d76d3f4cd3..8f6262f497 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -397,7 +397,7 @@ dependencies:
           - hypothesis>=6.0,<7
           - nltk
           - numpydoc
-          - pytest
+          - pytest==7.*
           - pytest-benchmark
           - pytest-cases
           - pytest-cov
diff --git a/python/pyproject.toml b/python/pyproject.toml
index c347b91b9e..c064b65fff 100644
--- a/python/pyproject.toml
+++ b/python/pyproject.toml
@@ -85,11 +85,11 @@ test = [
     "nltk",
     "numpydoc",
     "pynndescent==0.5.8",
-    "pytest",
     "pytest-benchmark",
     "pytest-cases",
     "pytest-cov",
     "pytest-xdist",
+    "pytest==7.*",
     "scikit-learn==1.2",
     "seaborn",
     "statsmodels",