test: use davis branch

run plz

run for real

use true dev xarray

get versions right for wacky dev version

something

Author: ianhi

.github/workflows/upstream-dev-ci.yaml

@@ -39,16 +39,8 @@ jobs:
   upstream-dev:
     name: upstream-dev
     runs-on: ubuntu-latest
-    needs: detect-ci-trigger
     env:
       ZARR_V3_EXPERIMENTAL_API: 1
-    if: |
-      always()
-      && (
-          (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch')
-          || needs.detect-ci-trigger.outputs.triggered == 'true'
-          || contains( github.event.pull_request.labels.*.name, 'run-upstream')
-      )
     defaults:
       run:
         shell: bash -l {0}
@@ -73,7 +65,7 @@ jobs:
           bash ci/install-upstream-wheels.sh
       - name: Install xarray
         run: |
-          python -m pip install --no-deps -e .
+          python -m pip install git+https://github.com/pydata/xarray
       - name: Version info
         run: |
           python xarray/util/print_versions.py

ci/install-upstream-wheels.sh

@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 
 if which micromamba >/dev/null; then
-    conda=micromamba
+  conda=micromamba
 elif which mamba >/dev/null; then
-    conda=mamba
+  conda=mamba
 else
-    conda=conda
+  conda=conda
 fi
 
 # temporarily (?) remove numbagg and numba
@@ -14,53 +14,53 @@ $conda remove -y numba numbagg sparse
 $conda remove -y numexpr
 # forcibly remove packages to avoid artifacts
 $conda remove -y --force \
-    numpy \
-    scipy \
-    pandas \
-    distributed \
-    fsspec \
-    zarr \
-    cftime \
-    packaging \
-    bottleneck \
-    flox
-    # pint
+  numpy \
+  scipy \
+  pandas \
+  distributed \
+  fsspec \
+  zarr \
+  cftime \
+  packaging \
+  bottleneck \
+  flox
+# pint
 
 # to limit the runtime of Upstream CI
 python -m pip install \
-    -i https://pypi.anaconda.org/scientific-python-nightly-wheels/simple \
-    --no-deps \
-    --pre \
-    --upgrade \
-    numpy \
-    scipy \
-    matplotlib \
-    pandas
+  -i https://pypi.anaconda.org/scientific-python-nightly-wheels/simple \
+  --no-deps \
+  --pre \
+  --upgrade \
+  numpy \
+  scipy \
+  matplotlib \
+  pandas
 # for some reason pandas depends on pyarrow already.
 # Remove once a `pyarrow` version compiled with `numpy>=2.0` is on `conda-forge`
 python -m pip install \
-    -i https://pypi.fury.io/arrow-nightlies/ \
-    --prefer-binary \
-    --no-deps \
-    --pre \
-    --upgrade \
-    pyarrow
+  -i https://pypi.fury.io/arrow-nightlies/ \
+  --prefer-binary \
+  --no-deps \
+  --pre \
+  --upgrade \
+  pyarrow
 # manually install `pint`, `donfig`, and `crc32c` to pull in new dependencies
 python -m pip install --upgrade pint donfig crc32c
 python -m pip install \
-    --no-deps \
-    --upgrade \
-    git+https://github.com/dask/dask \
-    git+https://github.com/dask/dask-expr \
-    git+https://github.com/dask/distributed \
-    git+https://github.com/zarr-developers/zarr-python \
-    git+https://github.com/Unidata/cftime \
-    git+https://github.com/pypa/packaging \
-    git+https://github.com/hgrecco/pint \
-    git+https://github.com/pydata/bottleneck \
-    git+https://github.com/intake/filesystem_spec \
-    git+https://github.com/SciTools/nc-time-axis \
-    git+https://github.com/xarray-contrib/flox \
-    git+https://github.com/h5netcdf/h5netcdf \
-    git+https://github.com/dgasmith/opt_einsum
-    # git+https://github.com/pydata/sparse
+  --no-deps \
+  --upgrade \
+  git+https://github.com/dask/dask \
+  git+https://github.com/dask/dask-expr \
+  git+https://github.com/dask/distributed \
+  git+https://github.com/d-v-b/zarr-python.git@feat/fixed-length-strings \
+  git+https://github.com/Unidata/cftime \
+  git+https://github.com/pypa/packaging \
+  git+https://github.com/hgrecco/pint \
+  git+https://github.com/pydata/bottleneck \
+  git+https://github.com/intake/filesystem_spec \
+  git+https://github.com/SciTools/nc-time-axis \
+  git+https://github.com/xarray-contrib/flox \
+  git+https://github.com/h5netcdf/h5netcdf \
+  git+https://github.com/dgasmith/opt_einsum
+# git+https://github.com/pydata/sparse

xarray/backends/zarr.py

@@ -106,7 +106,10 @@ def _choose_default_mode(
 
 
 def _zarr_v3() -> bool:
-    return module_available("zarr", minversion="3")
+    # hack for this test only
+    # version being pickd up as 3.0.0b which is apparently not greater than 3
+    # return True
+    return module_available("zarr", minversion="3.0.0a0")
 
 
 # need some special secret attributes to tell us the dimensions
@@ -1067,6 +1070,10 @@ def _create_new_array(
                 if c in encoding:
                     encoding["config"][c] = encoding.pop(c)
 
+        print(fill_value)
+        print(encoding)
+        print(dtype)
+        print(shape)
         zarr_array = self.zarr_group.create(
             name,
             shape=shape,

xarray/tests/__init__.py

@@ -129,7 +129,7 @@ def _importorskip(
 has_bottleneck, requires_bottleneck = _importorskip("bottleneck")
 has_rasterio, requires_rasterio = _importorskip("rasterio")
 has_zarr, requires_zarr = _importorskip("zarr")
-has_zarr_v3, requires_zarr_v3 = _importorskip("zarr", "3.0.0")
+has_zarr_v3, requires_zarr_v3 = _importorskip("zarr", "3.0.0a01")
 has_fsspec, requires_fsspec = _importorskip("fsspec")
 has_iris, requires_iris = _importorskip("iris")
 has_numbagg, requires_numbagg = _importorskip("numbagg")

xarray/tests/test_backends.py

@@ -369,6 +369,8 @@ def create_store(self):
     def roundtrip(
         self, data, save_kwargs=None, open_kwargs=None, allow_cleanup_failure=False
     ):
+        print(save_kwargs)
+        print(open_kwargs)
         if save_kwargs is None:
             save_kwargs = {}
         if open_kwargs is None:
@@ -926,6 +928,9 @@ def test_roundtrip_bytes_with_fill_value(self) -> None:
         encoding = {"_FillValue": b"X", "dtype": "S1"}
         original = Dataset({"x": ("t", values, {}, encoding)})
         expected = original.copy(deep=True)
+        zarr_format_3 = has_zarr_v3 and zarr.config.config["default_zarr_format"] == 3
+        print(zarr_format_3)
+        print(self.version_kwargs)
         with self.roundtrip(original) as actual:
             assert_identical(expected, actual)
 
@@ -2363,6 +2368,7 @@ def create_store(self, cache_members: bool = False):
             )
 
     def save(self, dataset, store_target, **kwargs):  # type: ignore[override]
+        print("ver kwargs", self.version_kwargs)
         return dataset.to_zarr(store=store_target, **kwargs, **self.version_kwargs)
 
     @contextlib.contextmanager
@@ -3832,6 +3838,10 @@ def roundtrip_dir(
         if open_kwargs is None:
             open_kwargs = {}
 
+        print("here?")
+        print(save_kwargs)
+        print(self.version_kwargs)
+        print(open_kwargs)
         data.to_zarr(store, **save_kwargs, **self.version_kwargs)
         with xr.open_dataset(
             store, engine="zarr", **open_kwargs, **self.version_kwargs