Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update docu #83

Merged
merged 21 commits into from
May 5, 2020
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
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,10 @@ src/*

# version.py
essm/version.py

# Jupyter temp files
.ipynb_checkpoints
*/.ipynb_checkpoints/*

# Documentation build
docs/_build/
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ env:

before_install:
- git fetch --tags
- sudo apt-get install pandoc
- travis_retry pip install -U twine wheel coveralls pip
- travis_retry pip install check-manifest pydocstyle
- travis_retry pip install -r requirements-devel.txt
Expand Down
12 changes: 12 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
Changes
=======

``v0.4.2``
----------
*released 2019-11-20*

Bug Fixes
~~~~~~~~~

- **utils:** Improve markdown representation of units (`PR #79 <https://github.com/environmentalscience/essm/pull/79>`__)

- **variables:** Fix generate_metadata_table for selected variables (`PR #80 <https://github.com/environmentalscience/essm/pull/80>`__)


``v0.4.1``
----------
*released 2019-11-20*
Expand Down
2 changes: 2 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,6 @@ recursive-include docs/_static *.png
recursive-include essm *.yapf
recursive-include tests *.py

recursive-exclude docs/_build *

prune src
Binary file modified docs/_static/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 11 additions & 14 deletions docs/api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@
API Docs
========

Jupyter notebooks with API examples
===================================
A jupyter notebook with tables of importable variables and equations can be found at
https://github.com/environmentalscience/essm/blob/master/docs/examples/importable_variables_equations.ipynb

A jupyter notebook with use examples for the API can be found at
https://github.com/environmentalscience/essm/blob/master/docs/examples/api_features.ipynb

Variables
=========

Expand Down Expand Up @@ -35,10 +43,10 @@ Radiation
.. automodule:: essm.variables.leaf.radiation
:members:

Water Vapour
~~~~~~~~~~~~
Energy and Water
~~~~~~~~~~~~~~~~

.. automodule:: essm.variables.leaf.water_vapour
.. automodule:: essm.variables.leaf.energy_water
:members:

Physics
Expand All @@ -58,17 +66,6 @@ Equations

.. automodule:: essm.equations

Chamber
-------

.. automodule:: essm.equations.chamber

Insulation
~~~~~~~~~~

.. automodule:: essm.equations.chamber.insulation
:members:

Leaf
----

Expand Down
13 changes: 9 additions & 4 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ def get_attr(obj, value, *args, **kwargs):
'matplotlib.sphinxext.plot_directive', 'sphinxcontrib.bibtex',
'sphinx.ext.autodoc', 'sphinx.ext.autosummary', 'sphinx.ext.doctest',
'sphinx.ext.intersphinx', 'sphinx.ext.todo', 'sphinx.ext.coverage',
'sphinx.ext.mathjax', 'sphinx.ext.viewcode', 'sphinx.ext.githubpages'
'sphinx.ext.mathjax', 'sphinx.ext.viewcode', 'sphinx.ext.githubpages',
'nbsphinx'
]

# Add any paths that contain templates here, relative to this directory.
Expand Down Expand Up @@ -140,7 +141,8 @@ def get_attr(obj, value, *args, **kwargs):
# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
# This patterns also effect to html_static_path and html_extra_path
exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store',
'**.ipynb_checkpoints']

# The name of the Pygments (syntax highlighting) style to use.
pygments_style = 'sphinx'
Expand All @@ -163,7 +165,7 @@ def get_attr(obj, value, *args, **kwargs):
'logo': 'logo.png',
'logo_name': False,
'description':
'This package contains helpers to deal with physical variables '
'Python package for dealing with physical variables '
'and units.',
'github_user': 'environmentalscience',
'github_repo': 'essm',
Expand Down Expand Up @@ -250,4 +252,7 @@ def get_attr(obj, value, *args, **kwargs):

autoclass_content = 'both'

autodoc_default_flags = ['members', 'undoc-members', 'show-inheritance']
autodoc_default_options = {
'undoc-members': True,
'show-inheritance': True
}
1,086 changes: 630 additions & 456 deletions docs/examples/api_features.ipynb

Large diffs are not rendered by default.

Loading