Merge pull request #691 from rapidsai/branch-24.02

Forward-merge branch-24.02 to branch-24.04
rapidsai · Jan 30, 2024 · 7af904b · 7af904b
2 parents baabda6 + e29ebc7
commit 7af904b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -39,7 +39,7 @@ dependencies:
 - pytest-cov>=2.12.1
 - pytest-lazy-fixture>=0.6.3
 - pytest-xdist
-- pytest>=6.2.4
+- pytest>=6.2.4,<8.0.0a0
 - python>=3.8,<3.11
 - pywavelets>=1.0
 - recommonmark

diff --git a/conda/environments/all_cuda-120_arch-x86_64.yaml b/conda/environments/all_cuda-120_arch-x86_64.yaml
@@ -38,7 +38,7 @@ dependencies:
 - pytest-cov>=2.12.1
 - pytest-lazy-fixture>=0.6.3
 - pytest-xdist
-- pytest>=6.2.4
+- pytest>=6.2.4,<8.0.0a0
 - python>=3.8,<3.11
 - pywavelets>=1.0
 - recommonmark

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -254,7 +254,7 @@ dependencies:
         packages:
           - GPUtil>=1.4.0
           - psutil>=5.8.0
-          - pytest>=6.2.4
+          - pytest>=6.2.4,<8.0.0a0
           - pytest-cov>=2.12.1
           - pytest-lazy-fixture>=0.6.3
           - pytest-xdist

diff --git a/python/cucim/pyproject.toml b/python/cucim/pyproject.toml
@@ -72,7 +72,7 @@ test = [
     "pytest-cov>=2.12.1",
     "pytest-lazy-fixture>=0.6.3",
     "pytest-xdist",
-    "pytest>=6.2.4",
+    "pytest>=6.2.4,<8.0.0a0",
     "pywavelets>=1.0",
     "tifffile>=2022.7.28",
 ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.