Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
609c38a
Attempt to update docs
emmleroy Jul 8, 2026
8b9a47c
Another attempt at making docs
emmleroy Jul 8, 2026
20072db
Actually succeed at updating docs
emmleroy Jul 8, 2026
e443b00
Undo package re-name
emmleroy Jul 13, 2026
36eaf77
Update list of supported Python versions
emmleroy Jul 13, 2026
49189e5
gitignore vscode settings
emmleroy Jul 13, 2026
8581201
Add overview of library funcs
emmleroy Jul 13, 2026
b3e23f8
fix: add optional args to merge command
emmleroy Jul 13, 2026
14cfe15
Update usage docs
emmleroy Jul 13, 2026
2a9fe0b
Remove unused loguru levels
emmleroy Jul 14, 2026
d14bc68
Change default suffixes for keep=left/left to empty string (columns r…
emmleroy Jul 14, 2026
af3461e
Format usage.rst
emmleroy Jul 14, 2026
f6b323f
Delete test log files
emmleroy Jul 14, 2026
92504b5
Update log usage without renamed package
emmleroy Jul 14, 2026
4b20e02
Add logging configs and imports
emmleroy Jul 14, 2026
f142999
Allow imports from toolkit module
emmleroy Jul 14, 2026
156b4f9
Don't coerce dtypes when expunging and move flag nan check to flag_da…
emmleroy Jul 14, 2026
aa77d34
Don't coerce dtypes when expunging and move flag nan check to flag_da…
emmleroy Jul 14, 2026
28deb3b
For duplicated columns after merging, collapse if the duplicated colu…
emmleroy Jul 14, 2026
b8b9825
Modify merge tests to account for collapsed duplicated, identical col…
emmleroy Jul 14, 2026
5c0d811
Create example notebook for using the Python library
emmleroy Jul 14, 2026
f1002fc
Fix docstring indentation issue
emmleroy Jul 14, 2026
c549454
Fix docstring indentation issue
emmleroy Jul 14, 2026
05027dc
Don't cross-reference options
emmleroy Jul 14, 2026
e4b29e1
Re-run notebook
emmleroy Jul 14, 2026
3ecaf2a
Move merge columns assertion to a helper func; and undo no safe_loadi…
emmleroy Jul 14, 2026
e8666b0
Add tests for keep left/right
emmleroy Jul 14, 2026
83d7cdb
Don't use default merge test assertion if keep=left/right
emmleroy Jul 14, 2026
8cb2013
Remove extra cells
emmleroy Jul 14, 2026
bbf3120
Fix indentation issues again
emmleroy Jul 14, 2026
1bbdad5
Re-introduce default schema validation for expunge and flag
emmleroy Jul 14, 2026
4f9531b
Add test for nan flags
emmleroy Jul 14, 2026
4f74cc7
Modify public vs private functions
emmleroy Jul 14, 2026
8cbf4e7
Remove extra cells again
emmleroy Jul 14, 2026
cf5d278
fix: fix cli suffixes specification and add tests for custom suffixes
emmleroy Jul 14, 2026
c46a7a2
Re-order imports
emmleroy Jul 14, 2026
14da369
Move jupyter to dev deps
emmleroy Jul 15, 2026
82f39cc
Bump poetry version to 1.8.4 in gh-actions
emmleroy Jul 15, 2026
23f2ab6
Add a docs preview artifact for PRs
emmleroy Jul 15, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-and-deploy-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
53 changes: 53 additions & 0 deletions .github/workflows/docs-preview.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-and-verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ 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
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@ venv.bak/
.spyderproject
.spyproject

# VScode workspace settings
.vscode

# Rope project settings
.ropeproject

Expand Down
58 changes: 56 additions & 2 deletions docs/api.rst
Original file line number Diff line number Diff line change
@@ -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:
9 changes: 8 additions & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]

Expand All @@ -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 -------------------------------------------------

Expand Down
4 changes: 2 additions & 2 deletions docs/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified docs/flag-output.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/flag-output2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 2 additions & 4 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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::
Expand All @@ -17,5 +17,3 @@ interacting with QuantAQ air quality sensor data.
usage
contributing
api


Loading
Loading