Merge branch 'branch-25.02' into sep-impl-and-intfc

rapidsai · Jan 14, 2025 · 811c4f4 · 811c4f4
2 parents 2700ace + 883971a
commit 811c4f4
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/conda/environments/all_cuda-118_arch-aarch64.yaml b/conda/environments/all_cuda-118_arch-aarch64.yaml
@@ -38,5 +38,5 @@ dependencies:
 - sphinx-click
 - sphinx_rtd_theme
 - sysroot_linux-aarch64=2.17
-- zarr
+- zarr>=2.0.0,<3.0.0a0
 name: all_cuda-118_arch-aarch64
diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -40,5 +40,5 @@ dependencies:
 - sphinx-click
 - sphinx_rtd_theme
 - sysroot_linux-64=2.17
-- zarr
+- zarr>=2.0.0,<3.0.0a0
 name: all_cuda-118_arch-x86_64
diff --git a/conda/environments/all_cuda-125_arch-aarch64.yaml b/conda/environments/all_cuda-125_arch-aarch64.yaml
@@ -38,5 +38,5 @@ dependencies:
 - sphinx-click
 - sphinx_rtd_theme
 - sysroot_linux-aarch64=2.17
-- zarr
+- zarr>=2.0.0,<3.0.0a0
 name: all_cuda-125_arch-aarch64
diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml
@@ -38,5 +38,5 @@ dependencies:
 - sphinx-click
 - sphinx_rtd_theme
 - sysroot_linux-64=2.17
-- zarr
+- zarr>=2.0.0,<3.0.0a0
 name: all_cuda-125_arch-x86_64
diff --git a/conda/recipes/kvikio/meta.yaml b/conda/recipes/kvikio/meta.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2023-2024, NVIDIA CORPORATION.
+# Copyright (c) 2023-2025, NVIDIA CORPORATION.
 
 {% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').lstrip('v') %}
 {% set py_version = environ['CONDA_PY'] %}
@@ -75,7 +75,7 @@ requirements:
     - python
     - numpy >=1.23,<3.0a0
     - cupy >=12.0.0
-    - zarr
+    - zarr >=2.0.0,<3.0.0a0
     # See https://github.com/zarr-developers/numcodecs/pull/475
     - numcodecs !=0.12.0
     - packaging

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -365,7 +365,7 @@ dependencies:
       - output_types: [conda, requirements, pyproject]
         packages:
           - numpy>=1.23,<3.0a0
-          - zarr
+          - zarr>=2.0.0,<3.0.0a0
           # See https://github.com/zarr-developers/numcodecs/pull/475
           - numcodecs !=0.12.0
           - packaging

diff --git a/python/kvikio/pyproject.toml b/python/kvikio/pyproject.toml
@@ -25,7 +25,7 @@ dependencies = [
     "numpy>=1.23,<3.0a0",
     "nvidia-nvcomp==4.1.0.6",
     "packaging",
-    "zarr",
+    "zarr>=2.0.0,<3.0.0a0",
 ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
 classifiers = [
     "Intended Audience :: Developers",