From 883971abcce04838570f505fad91c6c7b8e71594 Mon Sep 17 00:00:00 2001 From: "Mads R. B. Kristensen" Date: Mon, 13 Jan 2025 15:23:07 +0100 Subject: [PATCH] Zarr: pin to version 2.* (#583) Now that Zarr v3 has been released, we need to pin to version 2 for now. Authors: - Mads R. B. Kristensen (https://github.com/madsbk) Approvers: - Bradley Dice (https://github.com/bdice) URL: https://github.com/rapidsai/kvikio/pull/583 --- conda/environments/all_cuda-118_arch-aarch64.yaml | 2 +- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-125_arch-aarch64.yaml | 2 +- conda/environments/all_cuda-125_arch-x86_64.yaml | 2 +- conda/recipes/kvikio/meta.yaml | 4 ++-- dependencies.yaml | 2 +- python/kvikio/pyproject.toml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-aarch64.yaml b/conda/environments/all_cuda-118_arch-aarch64.yaml index ae03e118a6..d73a2b2837 100644 --- 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 index d20e80634a..2d6a38d5be 100644 --- 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 index 86280e13cd..eb4f7c47a6 100644 --- 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 index b15b9240b2..978ede6fb0 100644 --- 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 index 271712ac51..5be312c985 100644 --- 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 index 32dc58d009..52920ee41d 100644 --- 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 index c9a9ab80d2..9ce0467ede 100644 --- 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",