Merge branch 'development' into patch-1

icesat2py · Jan 9, 2025 · 2264106 · 2264106
2 parents 6e19470 + 7605002
commit 2264106
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -11,3 +11,6 @@ updates:
           - "*"  # Group all Actions updates into a single larger pull request
     schedule:
       interval: monthly
+    ignore:
+      - dependency-name: "sangonzal/repository-traffic-action"
+        versions: "v1"
diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml
@@ -42,6 +42,6 @@ jobs:
           pytest icepyx/tests/integration --verbose --cov app
 
       - name: "Upload coverage report"
-        uses: "codecov/codecov-action@v4.5.0"
+        uses: "codecov/codecov-action@v4.6.0"
         with:
           token: "${{ secrets.CODECOV_TOKEN }}"
diff --git a/.github/workflows/unit_test.yml b/.github/workflows/unit_test.yml
@@ -38,6 +38,6 @@ jobs:
             --ignore=icepyx/tests/integration
 
       - name: "Upload coverage report"
-        uses: "codecov/codecov-action@v4.5.0"
+        uses: "codecov/codecov-action@v4.6.0"
         with:
           token: "${{ secrets.CODECOV_TOKEN }}"
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: check-toml
       - id: check-yaml
@@ -26,14 +26,14 @@ repos:
           - tomli
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.6.3
+    rev: v0.8.6
     hooks:
       - id: ruff
         args: ["--fix", "--show-fixes"]
       - id: ruff-format
 
   - repo: https://github.com/abravalheri/validate-pyproject
-    rev: v0.19
+    rev: v0.23
     hooks:
       - id: validate-pyproject
 

diff --git a/icepyx/core/read.py b/icepyx/core/read.py
@@ -553,6 +553,8 @@ def _combine_nested_vars(is2ds, ds, grp_path, wanted_dict):
             pass
 
         ds = ds[grp_spec_vars].swap_dims({"delta_time": "photon_idx"})
+        # add the rest of the dimensions of length 1 from is2ds to ds
+        ds = ds.expand_dims(dim=[dim for dim in is2ds.dims if is2ds[dim].size == 1])
         is2ds = is2ds.assign(ds)
 
         return is2ds
@@ -812,7 +814,7 @@ def _build_single_file_dataset(self, file, groups_list):
 
                 # if there are any deeper nested variables,
                 # get those so they have actual coordinates and add them
-                # this may apply to (at a minimum): ATL08
+                # this may apply to (at a minimum): ATL06, ATL08
                 if any(grp_path in grp_path2 for grp_path2 in wanted_groups_list):
                     for grp_path2 in wanted_groups_list:
                         if grp_path in grp_path2: