Github actions

.github/workflows/new_pypi_release.yml

@@ -0,0 +1,56 @@
+# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: Release to Pypi
+
+# Run on a published release and push to Pypi
+on: 
+  release: 
+    types: [published]
+
+jobs:
+
+  build_dist:
+    name: Build source distribution
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions/setup-python@v2
+        name: Install Python
+        with:
+          python-version: '3.6'
+
+      - name: Install dependencies
+        run: |
+          python3 -m pip install --upgrade pip wheel
+          python3 -m pip install -r requirements.txt
+
+      - name: Build dist
+        run: python setup.py sdist --formats=gztar
+
+      - name: Build wheel
+        run: python3 setup.py bdist_wheel
+
+      - uses: actions/upload-artifact@v2
+        with:
+          path: dist/*.tar.gz
+
+  upload_pypi:
+    needs: [build_dist]
+    runs-on: ubuntu-latest
+    # upload to PyPI on every tag starting with 'v'
+    # if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v')
+    # alternatively, to publish when a GitHub Release is created, use the following rule:
+    if: github.event_name == 'release' && github.event.action == 'published'
+    steps:
+      - uses: actions/download-artifact@v2
+        with:
+          name: artifact
+          path: dist
+
+      - uses: pypa/gh-action-pypi-publish@master
+        with:
+          user: __token__
+          password: ${{ secrets.pypi_password }}
+          # To test: repository_url: https://test.pypi.org/legacy/

.github/workflows/unittest.yml

@@ -0,0 +1,43 @@
+# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: Unittest
+
+# Run action on pull requests
+on:
+  pull_request:
+    branches: [ main ]
+
+jobs:
+
+  unittest:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.6'
+
+      - name: Install system dependencies
+        run: |
+          sudo apt-get install -y sqlite3 \
+            texlive-base \
+            texlive-latex-base \
+            texlive-latex-extra \
+            texlive-fonts-recommended \
+            texlive-fonts-extra
+        shell: bash
+
+      - name: Install python dependencies
+        run: |
+          python3 -m pip install --upgrade pip
+          python3 -m pip install -r requirements.txt
+          python3 setup.py install
+          mkdir ~/.config/matplotlib
+          echo "backend: Agg" > ~/.config/matplotlib/matplotlibrc
+
+      - name: Run unittests
+        run:  python3 -m unittest -v

.gitignore

@@ -44,4 +44,7 @@ tests/lakes/results/gold.db
 snowav/utils/gitinfo.py
 
 # pycharm
-.idea/
+.idea/
+
+.venv
+.vscode

README.md

@@ -1,7 +1,6 @@
 # SNOw and Water model Analysis and Visualization
 
 [![GitHub version](https://badge.fury.io/gh/USDA-ARS-NWRC%2Fsnowav.svg)](https://badge.fury.io/gh/USDA-ARS-NWRC%2Fsnowav)
-[![Build Status](https://travis-ci.org/USDA-ARS-NWRC/snowav.svg?branch=devel)](https://travis-ci.org/USDA-ARS-NWRC/snowav)
 
 SNOWAV was developed at the USDA Agricultural Research Service in Boise, Idaho, and processes AWSM model outputs into formats and figures for use by water resource managers. See CoreConfig.ini for details on config options.
 
@@ -26,6 +25,8 @@ $ snowav -f config.ini
 
 Below are notes for some of the config file fields, for additional information for all options see ```snowav/config/CoreConfig.ini```.
 
+> **NOTE:** Do not have AWSM/SMRF outputs in a root directory with `run` in the path as `snowav` does a regex to replace this string. For example, the following path will produce an error `/path/runs/basin/ops` as it will be changed to `/data/datas/basin/ops`.
+
 #### [snowav]
 ```save_path:``` Path to save results to.
 

requirements.txt

@@ -2,7 +2,7 @@
 coloredlogs==6.1
 cmocean==1.1
 inicheck>0.7.5,<0.8
-Jinja2==2.10.1
+Jinja2==2.11.3
 latexcodec==1.0.5
 latex==0.7.0
 matplotlib==2.0.0
@@ -13,6 +13,5 @@ numpy==1.16.3
 requests>=2.0.0
 seaborn==0.8
 SQLAlchemy==1.3.3
-tablizer>=0.2.1,<0.3.0
-urllib3==1.24.3
 utm==0.4.0
+tablizer @ git+https://github.com/USDA-ARS-NWRC/tablizer@master#egg=tablizer

setup.py

@@ -56,8 +56,8 @@
     name='snowav',
     version='0.11.16',
     description="Snow and Water Model Analysis and Visualization ",
-    author="Mark Robertson",
-    author_email='mark.robertson@usda.gov',
+    author="USDA ARS NWRC",
+    author_email='snow@ars.usda.gov',
     url='https://github.com/USDA-ARS-NWRC/snowav',
     packages=['snowav',
               'snowav.config',

snowav/framework/process.py

@@ -148,8 +148,9 @@ def __init__(self, cfg, db):
                 for name in cfg.masks:
                     mask_list.append(deepcopy(cfg.masks[name]['mask']))
 
-                sf = cfg.rundirs_dict[wy_hour].replace('runs', 'data')
-                sf = sf.replace('run', 'data') + '/smrfOutputs/'
+                # sf = cfg.rundirs_dict[wy_hour].replace('runs', 'data')
+                # sf = sf.replace('run', 'data') + '/smrfOutputs/'
+                sf = cfg.rundirs_dict[wy_hour].replace('/runs/run', '/data/data') + '/smrfOutputs/'
 
                 params = {Inputs: [
                     ('date_time', 'eq', out_date),

tests/test_snowav.py

@@ -32,7 +32,7 @@
 
 """
 
-matplotlib.use('agg')
+matplotlib.use('Agg')
 
 topo_path = './tests/lakes/topo/topo.nc'
 gold_db_path = './tests/lakes/results/gold.db'