BUG: Fix closing files manually

.github/workflows/tests.yaml

@@ -26,32 +26,37 @@ jobs:
   docker_tests:
     needs: linting
     runs-on: ubuntu-latest
-    name: Docker | python=${{ matrix.python-version }} | rasterio${{ matrix.rasterio-version }} | scipy ${{ matrix.run-with-scipy }}
-    container: osgeo/gdal:ubuntu-full-3.4.2
+    name: Docker | GDAL=${{ matrix.gdal-version }} | python=${{ matrix.python-version }} | rasterio${{ matrix.rasterio-version }} | scipy ${{ matrix.run-with-scipy }}
+    container: osgeo/gdal:ubuntu-full-${{ matrix.gdal-version }}
     strategy:
       fail-fast: false
       matrix:
         python-version: ['3.8', '3.9', '3.10']
         rasterio-version: ['']
         xarray-version: ['']
         run-with-scipy: ['YES']
+        gdal-version: ['3.5.3']
         include:
           - python-version: '3.8'
             rasterio-version: ''
             xarray-version: '==0.17'
             run-with-scipy: 'YES'
+            gdal-version: '3.4.3'
           - python-version: '3.8'
             rasterio-version: '==1.1'
             xarray-version: ''
             run-with-scipy: 'YES'
+            gdal-version: '3.4.3'
           - python-version: '3.8'
             rasterio-version: '==1.2.1'
             xarray-version: ''
             run-with-scipy: 'YES'
+            gdal-version: '3.5.3'
           - python-version: '3.9'
             rasterio-version: ''
             xarray-version: ''
             run-with-scipy: 'NO'
+            gdal-version: '3.5.3'
     steps:
       - uses: actions/checkout@v3
 

docs/history.rst

@@ -3,6 +3,7 @@ History
 
 Latest
 ------
+- BUG: Fix closing files manually (pull #607)
 
 0.13.0
 -------

rioxarray/_io.py

@@ -13,6 +13,7 @@
 import re
 import threading
 import warnings
+from collections import defaultdict
 from typing import Any, Dict, Hashable, Iterable, List, Optional, Tuple, Union
 
 import numpy as np
@@ -737,6 +738,30 @@ def _pop_global_netcdf_attrs_from_vars(dataset_to_clean: Dataset) -> Dataset:
     return dataset_to_clean
 
 
+def _subdataset_groups_to_dataset(
+    dim_groups: Dict[Hashable, Dict[Hashable, DataArray]], global_tags: Dict
+) -> Union[Dataset, List[Dataset]]:
+    if dim_groups:
+        dataset: Union[Dataset, List[Dataset]] = []
+        for dim_group in dim_groups.values():
+            dataset_group = _pop_global_netcdf_attrs_from_vars(
+                Dataset(dim_group, attrs=global_tags)
+            )
+
+            def _ds_close():
+                # pylint: disable=cell-var-from-loop
+                for data_var in dim_group.values():
+                    data_var.close()
+
+            dataset_group.set_close(_ds_close)
+            dataset.append(dataset_group)
+        if len(dataset) == 1:
+            dataset = dataset.pop()
+    else:
+        dataset = Dataset(attrs=global_tags)
+    return dataset
+
+
 def _load_subdatasets(
     riods: RasterioReader,
     group: Optional[Union[str, List[str], Tuple[str, ...]]],
@@ -754,8 +779,7 @@ def _load_subdatasets(
     """
     Load in rasterio subdatasets
     """
-    global_tags = _parse_tags(riods.tags())
-    dim_groups = {}
+    dim_groups: Dict[Hashable, Dict[Hashable, DataArray]] = defaultdict(dict)
     subdataset_filter = None
     if any((group, variable)):
         subdataset_filter = build_subdataset_filter(group, variable)
@@ -777,23 +801,10 @@ def _load_subdatasets(
             decode_timedelta=decode_timedelta,
             **open_kwargs,
         )
-        if shape not in dim_groups:
-            dim_groups[shape] = {rioda.name: rioda}
-        else:
-            dim_groups[shape][rioda.name] = rioda
-
-    if len(dim_groups) > 1:
-        dataset: Union[Dataset, List[Dataset]] = [
-            _pop_global_netcdf_attrs_from_vars(Dataset(dim_group, attrs=global_tags))
-            for dim_group in dim_groups.values()
-        ]
-    elif not dim_groups:
-        dataset = Dataset(attrs=global_tags)
-    else:
-        dataset = _pop_global_netcdf_attrs_from_vars(
-            Dataset(list(dim_groups.values())[0], attrs=global_tags)
-        )
-    return dataset
+        dim_groups[shape][rioda.name] = rioda
+    return _subdataset_groups_to_dataset(
+        dim_groups=dim_groups, global_tags=_parse_tags(riods.tags())
+    )
 
 
 def _load_bands_as_variables(
@@ -836,7 +847,14 @@ def _load_bands_as_variables(
             .squeeze()  # type: ignore
             .drop("band")  # type: ignore
         )
-    return Dataset(data_vars, attrs=global_tags)
+    dataset = Dataset(data_vars, attrs=global_tags)
+
+    def _ds_close():
+        for data_var in data_vars.values():
+            data_var.close()
+
+    dataset.set_close(_ds_close)
+    return dataset
 
 
 def _prepare_dask(
@@ -1070,7 +1088,7 @@ def open_rasterio(
         captured_warnings = rio_warnings.copy()
 
     if band_as_variable:
-        return _load_bands_as_variables(
+        dataset_result = _load_bands_as_variables(
             riods=riods,
             parse_coordinates=parse_coordinates,
             chunks=chunks,
@@ -1082,6 +1100,8 @@ def open_rasterio(
             decode_timedelta=decode_timedelta,
             **open_kwargs,
         )
+        manager.close()
+        return dataset_result
 
     # raise the NotGeoreferencedWarning if applicable
     for rio_warning in captured_warnings:
@@ -1092,7 +1112,7 @@ def open_rasterio(
 
     # open the subdatasets if they exist
     if riods.subdatasets:
-        return _load_subdatasets(
+        subdataset_result = _load_subdatasets(
             riods=riods,
             group=group,
             variable=variable,
@@ -1106,6 +1126,8 @@ def open_rasterio(
             decode_timedelta=decode_timedelta,
             **open_kwargs,
         )
+        manager.close()
+        return subdataset_result
 
     if vrt_params is not None:
         riods = WarpedVRT(riods, **vrt_params)
@@ -1204,9 +1226,6 @@ def open_rasterio(
     if chunks is not None:
         result = _prepare_dask(result, riods, filename, chunks)
 
-    # Make the file closeable
-    result.set_close(manager.close)
-    result.rio._manager = manager
     # add file path to encoding
     result.encoding["source"] = riods.name
     result.encoding["rasterio_dtype"] = str(riods.dtypes[0])
@@ -1224,4 +1243,7 @@ def open_rasterio(
             for attr, value in result.attrs.items()
             if not attr.startswith(f"{result.name}#")
         }
+    # Make the file closeable
+    result.set_close(manager.close)
+    result.rio._manager = manager
     return result

rioxarray/xarray_plugin.py

@@ -70,8 +70,12 @@ def open_dataset(
             **open_kwargs,
         )
         if isinstance(rds, xr.DataArray):
-            rds = rds.to_dataset()
-        if not isinstance(rds, xr.Dataset):
+            dataset = rds.to_dataset()
+            dataset.set_close(rds._close)
+            rds = dataset
+        if isinstance(rds, list):
+            for dataset in rds:
+                dataset.close()
             raise RioXarrayError(
                 "Multiple resolution sets found. "
                 "Use 'variable' or 'group' to filter."

test/conftest.py

@@ -2,12 +2,15 @@
 import os
 
 import pytest
+import xarray
 from numpy.testing import assert_almost_equal, assert_array_equal
 from packaging import version
 
 import rioxarray
 from rioxarray.raster_array import UNWANTED_RIO_ATTRS
 
+xarray.set_options(warn_for_unclosed_files=True)
+
 TEST_DATA_DIR = os.path.join(os.path.dirname(__file__), "test_data")
 TEST_INPUT_DATA_DIR = os.path.join(TEST_DATA_DIR, "input")
 TEST_COMPARE_DATA_DIR = os.path.join(TEST_DATA_DIR, "compare")