Merge pull request #2143 from vyasr/branch-24.04-merge-branch-24.02

Branch 24.04 merge branch 24.02
rapidsai · Jan 31, 2024 · e407677 · e407677
2 parents d4ae271 + ac428e3
commit e407677
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/conda/environments/all_cuda-118_arch-aarch64.yaml b/conda/environments/all_cuda-118_arch-aarch64.yaml
@@ -44,8 +44,8 @@ dependencies:
 - nvcc_linux-aarch64=11.8
 - pre-commit
 - pydata-sphinx-theme
-- pytest
 - pytest-cov
+- pytest==7.*
 - rapids-dask-dependency==24.4.*
 - recommonmark
 - rmm==24.4.*

diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -44,8 +44,8 @@ dependencies:
 - nvcc_linux-64=11.8
 - pre-commit
 - pydata-sphinx-theme
-- pytest
 - pytest-cov
+- pytest==7.*
 - rapids-dask-dependency==24.4.*
 - recommonmark
 - rmm==24.4.*

diff --git a/conda/environments/all_cuda-120_arch-aarch64.yaml b/conda/environments/all_cuda-120_arch-aarch64.yaml
@@ -40,8 +40,8 @@ dependencies:
 - numpydoc
 - pre-commit
 - pydata-sphinx-theme
-- pytest
 - pytest-cov
+- pytest==7.*
 - rapids-dask-dependency==24.4.*
 - recommonmark
 - rmm==24.4.*

diff --git a/conda/environments/all_cuda-120_arch-x86_64.yaml b/conda/environments/all_cuda-120_arch-x86_64.yaml
@@ -40,8 +40,8 @@ dependencies:
 - numpydoc
 - pre-commit
 - pydata-sphinx-theme
-- pytest
 - pytest-cov
+- pytest==7.*
 - rapids-dask-dependency==24.4.*
 - recommonmark
 - rmm==24.4.*

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -500,7 +500,7 @@ dependencies:
     common:
       - output_types: [conda, requirements, pyproject]
         packages:
-          - pytest
+          - pytest==7.*
           - pytest-cov
   test_pylibraft:
     common:

diff --git a/python/pylibraft/pyproject.toml b/python/pylibraft/pyproject.toml
@@ -49,8 +49,8 @@ classifiers = [
 [project.optional-dependencies]
 test = [
     "cupy-cuda11x>=12.0.0",
-    "pytest",
     "pytest-cov",
+    "pytest==7.*",
     "scikit-learn",
     "scipy",
 ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.

diff --git a/python/raft-dask/pyproject.toml b/python/raft-dask/pyproject.toml
@@ -50,8 +50,8 @@ classifiers = [
 
 [project.optional-dependencies]
 test = [
-    "pytest",
     "pytest-cov",
+    "pytest==7.*",
 ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
 
 [project.urls]