Merge pull request #684 from rapidsai/branch-24.02

Forward-merge branch-24.02 to branch-24.04
rapidsai · Jan 26, 2024 · 7ddf541 · 7ddf541
2 parents e778efd + d048871
commit 7ddf541
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git a/dependencies.yaml b/dependencies.yaml
@@ -254,10 +254,10 @@ dependencies:
         packages:
           - GPUtil>=1.4.0
           - psutil>=5.8.0
+          - pytest>=6.2.4
           - pytest-cov>=2.12.1
           - pytest-lazy-fixture>=0.6.3
           - pytest-xdist
-          - pytest>=6.2.4
           - tifffile>=2022.7.28
           - pooch>=1.6.0  # needed to download scikit-image sample data
       - output_types: [conda]

diff --git a/python/cucim/requirements-test.txt b/python/cucim/requirements-test.txt
diff --git a/run b/run
@@ -608,11 +608,13 @@ install_python_test_deps_() {
         # (https://github.com/rapidsai/cucim/pull/433)
         run_command pip install -r ${TOP}/python/cucim/requirements-test.txt
     else
+        pushd "${TOP}/python/cucim"
         if [ -n "${VIRTUAL_ENV}" ]; then
-            run_command pip3 install -r ${TOP}/python/cucim/requirements-test.txt
+            run_command pip3 install -e .[test]
         else
-            run_command pip3 install --user -r ${TOP}/python/cucim/requirements-test.txt
+            run_command pip3 install --user -e .[test]
         fi
+	popd
     fi
     hash -r
 }