Merge pull request #146 from Azaya89/fix-ds

Dataset.dims FutureWarning
intake · Jun 30, 2024 · 8dfcba8 · 8dfcba8
2 parents d0418f7 + 4ca61da
commit 8dfcba8
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 6 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        CONDA_ENV: [py310, py38, py39, upstream]
+        CONDA_ENV: [py312, py311, py310, py39, upstream]
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/ci/environment-py310.yml b/ci/environment-py310.yml
@@ -23,3 +23,4 @@ dependencies:
   - s3fs
   - rioxarray
   - werkzeug < 2.2.0
+  - dask
diff --git a/ci/environment-py38.yml → ci/environment-py311.yml b/ci/environment-py38.yml → ci/environment-py311.yml
@@ -2,7 +2,7 @@ name: test_env
 channels:
   - conda-forge
 dependencies:
-  - python=3.8
+  - python=3.11
   - aiohttp
   - boto3
   - exifread
@@ -13,13 +13,14 @@ dependencies:
   - pip
   - pydap
   - pytest
-  - rasterio <= 1.3.6
+  - rasterio
   - s3fs >= 2021.08.0
   - scikit-image
-  - rangehttpserver
   - xarray >= 0.17
+  - rangehttpserver
   - zarr
   - moto < 3
   - s3fs
   - rioxarray
   - werkzeug < 2.2.0
+  - dask
diff --git a/ci/environment-py312.yml b/ci/environment-py312.yml
@@ -0,0 +1,26 @@
+name: test_env
+channels:
+  - conda-forge
+dependencies:
+  - python=3.12
+  - aiohttp
+  - boto3
+  - exifread
+  - flask
+  - h5netcdf
+  - intake
+  - netcdf4
+  - pip
+  - pydap
+  - pytest
+  - rasterio
+  - s3fs >= 2021.08.0
+  - scikit-image
+  - rangehttpserver
+  - xarray >= 0.17
+  - zarr
+  - moto < 3
+  - s3fs
+  - rioxarray
+  - werkzeug < 2.2.0
+  - dask
diff --git a/ci/environment-py39.yml b/ci/environment-py39.yml
@@ -23,3 +23,5 @@ dependencies:
   - s3fs
   - rioxarray
   - werkzeug < 2.2.0
+  - dask
+
diff --git a/ci/environment-upstream.yml b/ci/environment-upstream.yml
@@ -25,6 +25,7 @@ dependencies:
   - gdal
   - werkzeug < 2.2.0
   - rioxarray
+  - dask
   - pip:
        - git+https://github.com/fsspec/filesystem_spec.git
        - git+https://github.com/intake/intake.git

diff --git a/docs/source/contributing.rst b/docs/source/contributing.rst
@@ -106,7 +106,7 @@ Preparing Pull Requests
 
     $ conda env create -f ci/environment-py39.yml
     $ conda activate test_env
-    $ pip install . -e
+    $ pip install -e .
 
 
 #. Run all the tests

diff --git a/intake_xarray/raster.py b/intake_xarray/raster.py
@@ -104,7 +104,7 @@ def _get_schema(self):
 
             ds2 = xr.Dataset({'raster': self._ds})
             metadata = {
-                'dims': dict(ds2.dims),
+                'dims': dict(ds2.sizes),
                 'data_vars': {k: list(ds2[k].coords)
                               for k in ds2.data_vars.keys()},
                 'coords': tuple(ds2.coords.keys()),