Merge branch 'development' into argo

doc/source/contributing/quest-available-datasets.rst

@@ -26,4 +26,3 @@ Want to add a new dataset to QUEST? No problem! QUEST includes a template script
 Once you have developed a script with the template, you may request for the module to be added to QUEST via Github. Please see the How to Contribute page :ref:`dev_guide_label` for instructions on how to contribute to icepyx.
 
 Detailed guidelines on how to construct your dataset module are currently a work in progress.
-

doc/source/user_guide/changelog/index.rst

@@ -6,9 +6,17 @@ icepyx ChangeLog
 This is the list of changes made to icepyx in between each release.
 Full details can be found in the `commit logs <https://github.com/icesat2py/icepyx/commits>`_.
 
-Latest Release (Version 0.8.0)
+Latest Release (Version 0.8.1)
 ------------------------------
 
+.. toctree::
+   :maxdepth: 2
+
+   v0.8.1
+
+Version 0.8.0
+-------------
+
 .. toctree::
    :maxdepth: 2
 

doc/source/user_guide/changelog/v0.8.1.rst

@@ -0,0 +1,18 @@
+What's new in 0.8.1 (14 November 2023)
+-------------------------------------
+
+These are the changes in icepyx 0.8.1 See :ref:`release` for a full changelog
+including other versions of icepyx.
+
+
+
+Bug fixes
+~~~~~~~~~
+
+- fix the ATL08 delta_time dimension read error (#470)
+
+
+Contributors
+~~~~~~~~~~~~
+
+.. contributors:: v0.8.0..v0.8.1|HEAD

icepyx/core/read.py

@@ -695,11 +695,8 @@ def _combine_nested_vars(is2ds, ds, grp_path, wanted_dict):
         except (AttributeError, KeyError):
             pass
 
-        try:
-            is2ds = is2ds.assign(ds[grp_spec_vars])
-        except xr.MergeError:
-            ds = ds[grp_spec_vars].reset_coords()
-            is2ds = is2ds.assign(ds)
+        ds = ds[grp_spec_vars].swap_dims({"delta_time": "photon_idx"})
+        is2ds = is2ds.assign(ds)
 
         return is2ds
 

icepyx/quest/dataset_scripts/dataset.py

@@ -11,6 +11,7 @@ class DataSet:
     All sub-classes must support the following methods for use via the QUEST class.
     """
 
+
     def __init__(self, spatial_extent, date_range, start_time=None, end_time=None):
         """
         Complete any dataset specific initializations (i.e. beyond space and time) required here.

icepyx/quest/quest.py

@@ -20,7 +20,7 @@ class Quest(GenQuery):
     proj : proj4 string
         Geospatial projection.
         Not yet implemented
-
+        
 
     Returns
     -------
@@ -130,6 +130,7 @@ def add_icesat2(
 
         self.datasets["icesat2"] = query
 
+
     def add_argo(self, params=["temperature"], presRange=None) -> None:
         """
         Adds Argo (including Argo-BGC) to QUEST structure.
@@ -157,6 +158,7 @@ def add_argo(self, params=["temperature"], presRange=None) -> None:
         argo = Argo(self._spatial, self._temporal, params, presRange)
         self.datasets["argo"] = argo
 
+
     # ----------------------------------------------------------------------
     # Methods (on all datasets)
 

icepyx/tests/test_quest.py

@@ -18,6 +18,7 @@ def quest_instance(scope="module", autouse=True):
 # Paramaterize these add_dataset tests once more datasets are added
 def test_add_is2(quest_instance):
     # Add ATL06 as a test to QUEST
+
     prod = "ATL06"
     quest_instance.add_icesat2(product=prod)
     exp_key = "icesat2"
@@ -66,6 +67,7 @@ def test_search_all(quest_instance):
     # Search and test all datasets
     quest_instance.search_all()
 
+
 @pytest.mark.parametrize(
     "kwargs",
     [