Merge pull request #112 from ArtesiaWater/dev

Update master to v0.7.2

.github/workflows/ci.yml

@@ -1,8 +1,6 @@
 name: hydropandas
 
 on:
-  # Trigger the workflow on push or pull request on master,
-  # and only on pull-requests on dev branch
   push:
     branches:
       - master
@@ -12,40 +10,60 @@ on:
       - dev
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
+  test:
+    runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: true
       matrix:
-        python-version: [3.7]
+        include:
+          - name: Test suite with py310-ubuntu
+            python: "3.10"
+            os: ubuntu-latest
+            toxenv: py310
+          - name: Formatting with black + isort
+            python: "3.9"
+            os: ubuntu-latest
+            toxenv: format
+          - name: Linting with flake8 + ruff
+            python: "3.9"
+            os: ubuntu-latest
+            toxenv: lint
+          - name: Test suite for notebooks and coverage
+            python: "3.9"
+            os: ubuntu-latest
+            toxenv: notebooks
 
+    name: ${{ matrix.name }}
+    env:
+      # Color Output
+      # Rich (pip)
+      FORCE_COLOR: 1
+      # Tox
+      PY_COLORS: 1
+      # Pytest
+      PYTEST_ADDOPTS: "--color=yes"
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+
+      - name: Set up Python ${{ matrix.python }}
+        uses: actions/setup-python@v4
         with:
-          python-version: ${{ matrix.python-version }}
+          python-version: ${{ matrix.python }}
+          check-latest: true
+
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install flake8 pytest
-          pip install fsspec>=0.3.3
-          pip install dask[dataframe] --upgrade
-          if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-          pip install codecov
-          pip install pytest-cov
-          pip install pytest-dependency
-          pip install codacy-coverage
-          pip install -e .
-      - name: Lint with flake8
-        run: |
-          # stop the build if there are Python syntax errors or undefined names
-          flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
-          # exit-zero treats all errors as warnings.
-          flake8 . --count --exit-zero --max-complexity=10 --max-line-length=80 --statistics
-      - name: Run pytest
-        run: |
-          pytest
+          pip install tox
+
+      - name: Setup tox environment
+        run: tox -e ${{ matrix.toxenv }} --notest
+
+      - name: Test
+        run: tox -e ${{ matrix.toxenv }} --skip-pkg-install
+
       - name: Run codacy-coverage-reporter
+        if: ${{ matrix.toxenv == 'notebooks' && github.repository == 'ArtesiaWater/hydropandas' && success() }}
         uses: codacy/codacy-coverage-reporter-action@master
         with:
           project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}

.gitignore

@@ -101,6 +101,7 @@ ENV/
 
 # VS Code files
 .vscode/
+*.code-workspace
 .pytest_cache/
 
 *.html

.readthedocs.yml

@@ -14,11 +14,12 @@ formats: all
 
 # Optionally set the version of Python and requirements required to build your docs
 python:
-  version: 3.7
+  version: 3.8
   install:
-    - requirements: docs/requirements.txt
     - method: pip
       path: .
+      extra_requirements:
+        - "rtd"
 
 build:
   image: latest

docs/conf.py

@@ -13,9 +13,10 @@
 import os
 import sys
 
-sys.path.insert(0, os.path.abspath("."))
 from hydropandas import __version__
 
+sys.path.insert(0, os.path.abspath("."))
+
 
 # -- Project information -----------------------------------------------------
 

docs/source/hydropandas.io.rst

@@ -1,90 +1,90 @@
 hydropandas.io package
 ======================
 
-hydropandas.io.io\_arctic module
+hydropandas.io.arctic module
 --------------------------------
 
-.. automodule:: hydropandas.io.io_arctic
+.. automodule:: hydropandas.io.arctic
    :members:
    :undoc-members:
    :show-inheritance:
 
-hydropandas.io.io\_dino module
+hydropandas.io.dino module
 ------------------------------
 
-.. automodule:: hydropandas.io.io_dino
+.. automodule:: hydropandas.io.dino
    :members:
    :undoc-members:
    :show-inheritance:
 
-hydropandas.io.io\_fieldlogger module
+hydropandas.io.fieldlogger module
 -------------------------------------
 
-.. automodule:: hydropandas.io.io_fieldlogger
+.. automodule:: hydropandas.io.fieldlogger
    :members:
    :undoc-members:
    :show-inheritance:
 
-hydropandas.io.io\_knmi module
+hydropandas.io.knmi module
 ------------------------------
 
-.. automodule:: hydropandas.io.io_knmi
+.. automodule:: hydropandas.io.knmi
    :members:
    :undoc-members:
    :show-inheritance:
 
-hydropandas.io.io\_menyanthes module
+hydropandas.io.menyanthes module
 ------------------------------------
 
-.. automodule:: hydropandas.io.io_menyanthes
+.. automodule:: hydropandas.io.menyanthes
    :members:
    :undoc-members:
    :show-inheritance:
 
-hydropandas.io.io\_modflow module
+hydropandas.io.modflow module
 ---------------------------------
 
-.. automodule:: hydropandas.io.io_modflow
+.. automodule:: hydropandas.io.modflow
    :members:
    :undoc-members:
    :show-inheritance:
 
-hydropandas.io.io\_pastas module
+hydropandas.io.pastas module
 --------------------------------
 
-.. automodule:: hydropandas.io.io_pastas
+.. automodule:: hydropandas.io.pastas
    :members:
    :undoc-members:
    :show-inheritance:
 
-hydropandas.io.io\_pystore module
+hydropandas.io.pystore module
 ---------------------------------
 
-.. automodule:: hydropandas.io.io_pystore
+.. automodule:: hydropandas.io.pystore
    :members:
    :undoc-members:
    :show-inheritance:
 
-hydropandas.io.io\_waterinfo module
+hydropandas.io.waterinfo module
 -----------------------------------
 
-.. automodule:: hydropandas.io.io_waterinfo
+.. automodule:: hydropandas.io.waterinfo
    :members:
    :undoc-members:
    :show-inheritance:
 
-hydropandas.io.io\_wiski module
+hydropandas.io.wiski module
 -------------------------------
 
-.. automodule:: hydropandas.io.io_wiski
+.. automodule:: hydropandas.io.wiski
    :members:
    :undoc-members:
    :show-inheritance:
 
-hydropandas.io.io\_fews module
+hydropandas.io.fews module
 ------------------------------
 
-.. automodule:: hydropandas.io.io_fews
+.. automodule:: hydropandas.io.fews
    :members:
    :undoc-members:
    :show-inheritance: