Merge pull request #297 from icesat2py/development

v0.6.2 release

Author: JessicaS11

.github/workflows/get_pypi_stats.yml

@@ -23,15 +23,14 @@ jobs:
     # Calculates pypi stats and clones and stores in CSV file
     - name: Update pypi stats files
       run: |
-        pip install -r requirements.txt
+        pip install -r requirements.txt pypistats
         python ./doc/source/tracking/pypistats/get_pypi_stats.py
 
     # Commits files to repository
     - name: Commit changes
-      uses: EndBug/add-and-commit@v7
+      uses: EndBug/add-and-commit@v8
       with:
         author_name: learn2phoenix
         message: "Pypi stats auto-update"
         add: "./doc/source/tracking/pypistats/*"
-#         add: "./pypistats/*"
-        branch: "traffic"  # commits to branch "traffic"
+#         add: "./pypistats/*"

.github/workflows/traffic_action.yml

@@ -35,10 +35,9 @@ jobs:
     
     # Commits files to repository
     - name: Commit changes
-      uses: EndBug/add-and-commit@v7
+      uses: EndBug/add-and-commit@v8
       with:
         author_name: Jessica Scheick
         message: "GitHub traffic auto-update"
         add: "./doc/source/tracking/traffic/*"
 #         add: "./traffic/*"
-        branch: "traffic"  # commits to branch "traffic"

.github/workflows/uml_action.yml

@@ -11,6 +11,8 @@ jobs:
     steps:
       - name: Check out repository
         uses: actions/checkout@v2
+        with:
+          ref: ${{ github.event.pull_request.head.ref }}
       - name: set up environment
         run: |
           pip install -r requirements.txt
@@ -23,9 +25,8 @@ jobs:
           rm ./packages_dev_uml.svg
           mv ./*.svg ./doc/source/user_guide/documentation/
       - name: Commit changes
-        uses: EndBug/add-and-commit@v7
+        uses: EndBug/add-and-commit@v8
         with:
           author_name: GitHub Action
           message: "GitHub action UML generation auto-update"
           add: "./doc/source/user_guide/documentation/*"
-          ref: git branch --show-current

doc/source/example_notebooks/IS2_data_read-in.ipynb

@@ -426,7 +426,7 @@
     "\n",
     "***ATTENTION: icepyx loads your data by creating an Xarray DataSet for each input granule and then merging them. In some cases, the automatic merge fails and needs to be handled manually. In these cases, icepyx will return a warning with the error message from the failed Xarray merge and a list of per-granule DataSets***\n",
     "\n",
-    "This can happen if you unintentionally provide the same granule multiple times with different filenames."
+    "This can happen if you unintentionally provide the same granule multiple times with different filenames or in segmented products where the rgt+cycle automatically generated `gran_idx` values match. In this latter case, you can simply provide unique `gran_idx` values for each DataSet in `ds` and run `import xarray as xr` and `ds_merged = xr.merge(ds)` to create one merged DataSet."
    ]
   },
   {