Skip to content

Commit

Permalink
Merge pull request #77 from ArtesiaWater/dev
Browse files Browse the repository at this point in the history
Update master to v0.6.0
  • Loading branch information
OnnoEbbens authored Aug 10, 2022
2 parents f04193d + e081178 commit 73af819
Show file tree
Hide file tree
Showing 20 changed files with 4,939 additions and 657 deletions.
1 change: 0 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ jobs:
pip install fsspec>=0.3.3
pip install dask[dataframe] --upgrade
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
pip install pandas==1.1.5
pip install codecov
pip install pytest-cov
pip install pytest-dependency
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ ENV/

*.html
*cov.xml
*.png

.ignore*
.examples/figure*
60 changes: 30 additions & 30 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
import os
import sys

sys.path.insert(0, os.path.abspath('.'))
sys.path.insert(0, os.path.abspath("."))
from hydropandas import __version__


# -- Project information -----------------------------------------------------

project = 'hydropandas'
copyright = '2020, Artesia'
author = 'Artesia'
project = "hydropandas"
copyright = "2020, Artesia"
author = "Artesia"

# The short X.Y version
version = __version__
Expand All @@ -35,58 +35,58 @@
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = [
'sphinx.ext.autodoc',
'sphinx.ext.autosummary',
'sphinx.ext.napoleon',
'sphinx.ext.doctest',
'sphinx.ext.intersphinx',
'sphinx.ext.todo',
'sphinx.ext.coverage',
'sphinx.ext.mathjax',
'sphinx.ext.ifconfig',
'sphinx.ext.viewcode',
'IPython.sphinxext.ipython_console_highlighting', # lowercase didn't work
'sphinx.ext.autosectionlabel',
'nbsphinx',
'nbsphinx_link'
"sphinx.ext.autodoc",
"sphinx.ext.autosummary",
"sphinx.ext.napoleon",
"sphinx.ext.doctest",
"sphinx.ext.intersphinx",
"sphinx.ext.todo",
"sphinx.ext.coverage",
"sphinx.ext.mathjax",
"sphinx.ext.ifconfig",
"sphinx.ext.viewcode",
"IPython.sphinxext.ipython_console_highlighting", # lowercase didn't work
"sphinx.ext.autosectionlabel",
"nbsphinx",
"nbsphinx_link",
]

# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
templates_path = ["_templates"]

# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
# This pattern also affects html_static_path and html_extra_path.
exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]


# -- Options for HTML output -------------------------------------------------

# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
#
html_theme = 'sphinx_rtd_theme'
html_theme = "sphinx_rtd_theme"
# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the
# documentation.
#
html_theme_options = {
'display_version': True,
'prev_next_buttons_location': 'bottom',
"display_version": True,
"prev_next_buttons_location": "bottom",
# 'style_external_links': False,
# 'vcs_pageview_mode': '',
# 'style_nav_header_background': 'white',
# Toc options
'collapse_navigation': False,
'sticky_navigation': False,
'navigation_depth': 4,
'includehidden': True,
'titles_only': False,
"collapse_navigation": False,
"sticky_navigation": False,
"navigation_depth": 4,
"includehidden": True,
"titles_only": False,
}

# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = ['_static']
html_static_path = ["_static"]

master_doc = 'index'
master_doc = "index"
1,478 changes: 1,357 additions & 121 deletions examples/02_knmi_observations.ipynb

Large diffs are not rendered by default.

186 changes: 52 additions & 134 deletions examples/03_pastastore_from_observations.ipynb

Large diffs are not rendered by default.

Loading

0 comments on commit 73af819

Please sign in to comment.