Update the Quant AQ CLI

.github/workflows/build-and-deploy-docs.yml

@@ -6,10 +6,10 @@ on:
 jobs:
     build-docs:
         name: Build docs and push to gh-pages
-        runs-on: ubuntu-18.04
+        runs-on: ubuntu-latest
         steps:
             - name: Checkout branch
-              uses: actions/checkout@v2
+              uses: actions/checkout@v4
 
             - name: Setup python 
               uses: actions/setup-python@master
@@ -19,7 +19,7 @@ jobs:
             - name: Install poetry
               uses: snok/install-poetry@v1.3.3
               with:
-                version: 1.2.2
+                version: 1.8.4
                 virtualenvs-create: true
                 virtualenvs-in-project: true
                 installer-parallel: true

.github/workflows/docs-preview.yml

@@ -0,0 +1,53 @@
+name: docs/preview
+on:
+  pull_request:
+    paths:
+      - 'docs/**'
+      - '**.py'
+
+jobs:
+  build-docs-preview:
+    name: Build docs preview
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout branch
+        uses: actions/checkout@v4
+
+      - name: Setup python
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.10.5
+
+      - name: Install poetry
+        uses: snok/install-poetry@v1.3.3
+        with:
+          version: 1.8.4
+          virtualenvs-create: true
+          virtualenvs-in-project: true
+          installer-parallel: true
+
+      - name: Load cached venv
+        id: cached-poetry-dependencies
+        uses: actions/cache@v4
+        with:
+          path: .venv
+          key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}
+
+      - name: Install dependencies
+        if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
+        run: poetry install --no-interaction --no-root
+
+      - name: Build docs
+        run: |
+          source .venv/bin/activate
+          cd docs
+          make clean
+          make html
+          cd ..
+
+      - name: Upload docs artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: docs-preview-${{ github.event.pull_request.number }}
+          path: docs/_build/html
+          retention-days: 7

.github/workflows/release-drafter.yml

@@ -12,7 +12,7 @@ jobs:
   update_release_draft:
     runs-on: ubuntu-latest
     steps:
-      - uses: release-drafter/release-drafter@v5
+      - uses: release-drafter/release-drafter@v6
 
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -6,10 +6,10 @@ on:
 jobs:
     build-n-publish:
         name: Build and publish to PyPI
-        runs-on: ubuntu-18.04
+        runs-on: ubuntu-latest
         steps:
             - name: Checkout branch
-              uses: actions/checkout@v2
+              uses: actions/checkout@v4
 
             - name: Setup python 
               uses: actions/setup-python@v4
@@ -19,7 +19,7 @@ jobs:
             - name: Install poetry
               uses: snok/install-poetry@v1.3.3
               with:
-                version: 1.2.2
+                version: 1.8.4
                 virtualenvs-create: true
                 virtualenvs-in-project: true
                 installer-parallel: true

.github/workflows/test-and-verify.yml

@@ -5,11 +5,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: ["3.8", "3.9", "3.10"]
+        python: ["3.9", "3.10", "3.11"]
     name: Python ${{ matrix.python }} tests
     steps:
       - name: Checkout branch
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup Python ${{ matrix.python }}
         uses: actions/setup-python@master
@@ -19,14 +19,14 @@ jobs:
       - name: Install poetry
         uses: snok/install-poetry@v1
         with:
-          version: 1.2.2
+          version: 1.8.4
           virtualenvs-create: true
           virtualenvs-in-project: true
           installer-parallel: true
 
       - name: Load cached venv
         id: cached-poetry-dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: .venv
           key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}

.gitignore

@@ -117,6 +117,9 @@ venv.bak/
 .spyderproject
 .spyproject
 
+# VScode workspace settings
+.vscode
+
 # Rope project settings
 .ropeproject
 

README.md

@@ -14,11 +14,11 @@ Full documentation can be found [here](https://quant-aq.github.io/cli/).
 
 ## Dependencies
 
-This tool is built for Python 3.6.1+ and has the following key dependencies
+This tool is built for Python 3.9+ and has the following key dependencies
 
 ```
-python = ">=3.8,<4.0"
-pandas = ">=1.0.4"
+python = ">=3.9, <3.14"
+pandas = ">=2.1.4,<2.2"
 ```
 
 More details can be found in the `pyproject.toml` file at the base of this repository.

docs/api.rst

@@ -1,6 +1,60 @@
 API Reference
 =============
 
-.. click:: quantaq_cli.console:main
+CLI
+---
+
+.. click:: quantaq_cli.cli:main
    :prog: quantaq-cli
-   :show-nested:
+   :nested: full
+
+quantaq_cli.toolkit
+----------------------
+
+concat
+~~~~~~
+
+.. automodule:: quantaq_cli.toolkit.concat
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+expunge
+~~~~~~~
+
+.. automodule:: quantaq_cli.toolkit.expunge
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+flag
+~~~~
+
+.. automodule:: quantaq_cli.toolkit.flag
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+merge
+~~~~~
+
+.. automodule:: quantaq_cli.toolkit.merge
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+munge
+~~~~~
+
+.. automodule:: quantaq_cli.toolkit.munge
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+resample
+~~~~~~~~
+
+.. automodule:: quantaq_cli.toolkit.resample
+   :members:
+   :undoc-members:
+   :show-inheritance:

docs/conf.py

@@ -35,16 +35,18 @@
 
 
 # -- General configuration ---------------------------------------------------
+autosummary_generate = True
 
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
     'sphinx.ext.autodoc',
     'sphinx.ext.autosummary',
+    'sphinx.ext.napoleon', # google-style docstrings
     'sphinx_click.ext',
     'sphinx.ext.intersphinx',
-    'recommonmark',
+    'myst_parser',
     "sphinx_rtd_theme"
 ]
 
@@ -56,6 +58,11 @@
 # This pattern also affects html_static_path and html_extra_path.
 exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
 
+napoleon_google_docstring = True
+napoleon_numpy_docstring = False
+napoleon_include_init_with_doc = True
+napoleon_use_param = True
+napoleon_use_rtype = True
 
 # -- Options for HTML output -------------------------------------------------
 

docs/contributing.rst

@@ -38,8 +38,8 @@ Testing
 
     $ poetry run pytest -rP
 
-We support a number of Python versions. Currently, we support and test for 3.8, 
-3.9, and 3.10. These tests are automated and run as GitHub actions on every 
+We support a number of Python versions. Currently, we support and test for 3.9, 
+3.10, and 3.11. These tests are automated and run as GitHub actions on every 
 pull request.
 
 .. _issue tracker: https://github.com/quant-aq/cli/issues

docs/index.rst

@@ -6,8 +6,8 @@
 quantaq-cli
 ============
 
-**QuantAQ-CLI** provides an easy-to-use command line interface for munging and 
-interacting with QuantAQ air quality sensor data.
+**QuantAQ-CLI** provides an easy-to-use Python library and command line 
+interface for munging and interacting with QuantAQ air quality sensor data.
 
 
 .. toctree::
@@ -17,5 +17,3 @@ interacting with QuantAQ air quality sensor data.
    usage
    contributing
    api
-
-