Merge pull request #455 from dbekaert/dev

Release v0.3.1 -- python version and entry point fixes

Author: jhkennedy

.github/workflows/deploy-docs.yml

@@ -0,0 +1,32 @@
+name: Deploy Docs to Github.io
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  build_and_deploy:
+    name: Build site and deploy
+    runs-on: "ubuntu-latest"
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - uses: conda-incubator/setup-miniconda@v2
+        with:
+          mamba-version: "*"
+          python-version: '3.10'
+          activate-environment: RAiDER
+          environment-file: environment.yml
+
+      - name: install RAiDER
+        shell: bash -l {0}
+        run: |
+          python -m pip install --no-deps .
+
+      - name: Deploy website
+        shell: bash -l {0}
+        run: |
+          mkdocs gh-deploy --force

CHANGELOG.md

@@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [PEP 440](https://www.python.org/dev/peps/pep-0440/) 
 and uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.3.1]
+Fixes some missing imports and typing statements
+
 ## [0.3.0]
 RAiDER package was refactored to expose the main functionality as a Python library, including the `prepareWeatherModel` 
 and `tropo_delay` functions, as well as anciliarry functions needed for defining AOIs, look vectors, etc.

mkdocs.yml

@@ -8,6 +8,7 @@ nav:
   - Tutorials:
     - Overview: tutorials.md
     - RAiDER tutorial: https://nbviewer.org/github/dbekaert/RAiDER-docs/blob/main/notebooks/RAiDER_tutorial/RAiDER_tutorial.ipynb" target="_blank
+    - RAiDER Python tutorial: https://nbviewer.org/github/dbekaert/RAiDER-docs/blob/main/notebooks/RAiDER_tutorial/RAiDER_Python_access.ipynb" target="_blank
     - raiderStats tutorial: https://nbviewer.org/github/dbekaert/RAiDER-docs/blob/main/notebooks/raiderStats/raiderStats_tutorial.ipynb" target="_blank
     - Downloading GNSS tropospheric delays: https://nbviewer.org/github/dbekaert/RAiDER-docs/blob/main/notebooks/raiderDownloadGNSS/raiderDownloadGNSS_tutorial.ipynb"  target="_blank
     - GNSS delay manipulation with Pandas: https://nbviewer.org/github/dbekaert/RAiDER-docs/blob/main/notebooks/Pandas_tutorial/Pandas_tutorial.ipynb"  target="_blank

tools/RAiDER/cli/__main__.py

@@ -1,9 +1,10 @@
 import argparse
-import os
+import sys
 from importlib.metadata import entry_points
 
 from RAiDER.cli.raider import calcDelays, downloadGNSS, calcDelaysGUNW
 
+
 def main():
     parser = argparse.ArgumentParser(
         prefix_chars='+',
@@ -15,11 +16,18 @@ def main():
                      help='Select the entrypoint to use'
     )
     args, unknowns = parser.parse_known_args()
-    os.sys.argv = [args.process, *unknowns]
+    sys.argv = [args.process, *unknowns]
+
+    try:
+        # python >=3.10 interface
+        process_entry_point = entry_points(group='console_scripts', name=f'{args.process}.py')[0]
+    except TypeError:
+        # python 3.8 and 3.9 interface
+        scripts = entry_points()['console_scripts']
+        process_entry_point = [ep for ep in scripts if ep.name == f'{args.process}.py'][0]
 
-    process_entry_point = entry_points(group='console_scripts', name=f'{args.process}.py')[0]
     process_entry_point.load()()
 
 
 if __name__ == '__main__':
-    main()
+    main()

tools/RAiDER/cli/raider.py

@@ -3,14 +3,17 @@
 import shutil
 import sys
 import yaml
-import re, glob
+
+from textwrap import dedent
 
 import RAiDER
 from RAiDER.constants import _ZREF, _CUBE_SPACING_IN_M
 from RAiDER.logger import logger, logging
 from RAiDER.cli import DEFAULT_DICT, AttributeDict
+from RAiDER.cli.parser import add_out, add_cpus, add_verbose
 from RAiDER.cli.validators import (
-    enforce_time, enforce_bbox, parse_dates, get_query_region, get_heights, get_los, enforce_wm
+    enforce_time, enforce_bbox, parse_dates, get_query_region, get_heights, get_los, enforce_wm,
+    DateListAction, date_type,
 )
 
 

tools/RAiDER/delay.py

@@ -19,7 +19,7 @@
 import xarray
 
 from pyproj import CRS, Transformer
-from typing import List
+from typing import List, Union
 
 import isce3.ext.isce3 as isce
 import numpy as np
@@ -41,7 +41,7 @@ def tropo_delay(
         aoi, 
         los, 
         height_levels: List[float]=None, 
-        out_proj: int | str=4326, 
+        out_proj: Union[int, str] =4326, 
         cube_spacing_m: int=None,
         look_dir: str='right', 
     ):