Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ name: Python package

on:
push:
branches: ['master']
pull_request:
branches: ['master']

jobs:
build:
Expand All @@ -14,7 +16,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest]
python-version: [3.8, 3.9, '3.10', 3.11]
python-version: [3.8, 3.9, '3.10', 3.11, 3.12]

steps:
- uses: actions/checkout@v2
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/sphinx-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ jobs:
run: |
python -m pip install --upgrade pip
pip install .[doc]
ipython kernel install --name "python3" --user
sudo apt update -y && sudo apt install -y latexmk texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended dvipng pandoc
(cd docs && make docs)
(cd docs && make html)
Expand Down
15 changes: 8 additions & 7 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# -*- coding: utf-8 -*-

# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
Expand Down Expand Up @@ -32,7 +30,7 @@
'sphinx.ext.viewcode',
'sphinx.ext.githubpages',
'nbsphinx',
'nbsphinx_link'
'nbsphinx_link',
]

# Add any paths that contain templates here, relative to this directory.
Expand Down Expand Up @@ -85,7 +83,7 @@
autodoc_default_options = {
'members': True,
'inherited-members': False,
'private-members': True
'private-members': True,
}

# doctest
Expand All @@ -108,8 +106,8 @@
# documentation.

html_theme_options = {
"logo_only": False,
"display_version": True,
'logo_only': False,
'display_version': True,
}

# Add any paths that contain custom static files (such as style sheets) here,
Expand All @@ -124,5 +122,8 @@
r'https://streamstats.usgs.gov/streamstatsservices/#/',
r'https://www.waterqualitydata.us/public_srsnames/',
r'https://waterqualitydata.us',
r'https://github.com/USGS-python/dataretrieval/tree/master/demos/hydroshare'
r'https://github.com/USGS-python/dataretrieval/tree/master/demos/hydroshare',
]

# Some notebooks have warnings, which nbsphinx should ignore
nbsphinx_allow_errors = True
3 changes: 1 addition & 2 deletions docs/source/reference/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,4 @@ API reference
nwis
streamstats
utils
waterwatch
wqp
wqp
8 changes: 0 additions & 8 deletions docs/source/reference/waterwatch.rst

This file was deleted.

4 changes: 1 addition & 3 deletions docs/source/userguide/dataportals.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,5 @@ provided below.
+-----------------------------------+---------------------------------------------------------------+
| Water Quality Portal | https://waterqualitydata.us |
+-----------------------------------+---------------------------------------------------------------+
| WaterWatch | https://waterwatch.usgs.gov |
+-----------------------------------+---------------------------------------------------------------+
| Water Services | https://waterservices.usgs.gov |
+-----------------------------------+---------------------------------------------------------------+
+-----------------------------------+---------------------------------------------------------------+
5 changes: 4 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,12 @@ test = [
]
doc = [
"sphinx",
"sphinx_rtd_theme",
"sphinx-rtd-theme",
"nbsphinx",
"nbsphinx_link",
"ipython",
"ipykernel",
"matplotlib",
]
nldi = [
'geopandas>=0.10'
Expand Down