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

document class methods using sphinx3 recursive doc #1075

Merged
merged 8 commits into from
Oct 15, 2020
Merged
Show file tree
Hide file tree
Changes from 6 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
6 changes: 6 additions & 0 deletions docs/sphinx/source/_static/bracketed_reference_number.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
.footnote-reference::before {
content: '[';
}
.footnote-reference::after {
content: ']';
}
4 changes: 2 additions & 2 deletions docs/sphinx/source/_templates/autosummary/class.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
.. autoclass:: {{ objname }}

{% block methods %}
.. automethod:: __init__

{% if methods %}
.. rubric:: Methods

.. autosummary::
:toctree:
:recursive:
{% for item in methods %}
~{{ name }}.{{ item }}
{%- endfor %}
Expand Down
2 changes: 2 additions & 0 deletions docs/sphinx/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,8 @@ def setup(app):
app.add_stylesheet("no_scrollbars.css")
# Override footnote callout CSS to be normal text instead of superscript
app.add_stylesheet("no_reference_superscript.css")
# In-line links to references as numbers in brackets.
app.add_stylesheet("bracketed_reference_number.css")

# -- Options for LaTeX output ---------------------------------------------

Expand Down
3 changes: 3 additions & 0 deletions docs/sphinx/source/whatsnew/v0.8.1.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ Testing

Documentation
~~~~~~~~~~~~~
* Update sphinx to 3.1.2 and use the ``recursive`` option in ``autosummary`` class template.
(:issue:`1055`, :pull:`1075`)
* Add gallery example about backtracking on sloped terrain. (:pull:`1077`)

Requirements
Expand All @@ -40,5 +42,6 @@ Requirements
Contributors
~~~~~~~~~~~~
* Kevin Anderson (:ghuser:`kanderso-nrel`)
* Siyan (Veronica) Guo (:ghuser:`veronicaguo`)
* Will Holmgren (:ghuser:`wholmgren`)
* Cliff Hansen (:ghuser:`cwhanse`)
34 changes: 5 additions & 29 deletions pvlib/pvsystem.py
Original file line number Diff line number Diff line change
Expand Up @@ -656,11 +656,11 @@ def first_solar_spectral_loss(self, pw, airmass_absolute):
calculate the spectral loss modifier. The model coefficients are
specific to the module's cell type, and are determined by searching
for one of the following keys in self.module_parameters (in order):
'first_solar_spectral_coefficients' (user-supplied coefficients)
'Technology' - a string describing the cell type, can be read from
the CEC module parameter database
'Material' - a string describing the cell type, can be read from
the Sandia module database.
'first_solar_spectral_coefficients' (user-supplied coefficients)
'Technology' - a string describing the cell type, can be read from
the CEC module parameter database
'Material' - a string describing the cell type, can be read from
the Sandia module database.

Parameters
----------
Expand Down Expand Up @@ -741,12 +741,6 @@ def singlediode(self, photocurrent, saturation_current,
ivcurve_pnts=None):
"""Wrapper around the :py:func:`pvlib.pvsystem.singlediode` function.

Parameters
----------
See :py:func:`pvsystem.singlediode` for details

Returns
-------
See :py:func:`pvsystem.singlediode` for details
"""
return singlediode(photocurrent, saturation_current,
Expand All @@ -757,12 +751,6 @@ def i_from_v(self, resistance_shunt, resistance_series, nNsVth, voltage,
saturation_current, photocurrent):
"""Wrapper around the :py:func:`pvlib.pvsystem.i_from_v` function.

Parameters
----------
See :py:func:`pvsystem.i_from_v` for details

Returns
-------
See :py:func:`pvsystem.i_from_v` for details
"""
return i_from_v(resistance_shunt, resistance_series, nNsVth, voltage,
Expand All @@ -773,12 +761,6 @@ def snlinverter(self, v_dc, p_dc):
"""Uses :py:func:`pvlib.inverter.sandia` to calculate AC power based on
``self.inverter_parameters`` and the input voltage and power.

Parameters
----------
See :py:func:`pvlib.inverter.sandia` for details

Returns
-------
See :py:func:`pvlib.inverter.sandia` for details
"""
return inverter.sandia(v_dc, p_dc, self.inverter_parameters)
Expand All @@ -787,12 +769,6 @@ def adrinverter(self, v_dc, p_dc):
"""Uses :py:func:`pvlib.inverter.adr` to calculate AC power based on
``self.inverter_parameters`` and the input voltage and power.

Parameters
----------
See :py:func:`pvlib.inverter.adr` for details

Returns
-------
See :py:func:`pvlib.inverter.adr` for details
"""
return inverter.adr(v_dc, p_dc, self.inverter_parameters)
Expand Down
4 changes: 2 additions & 2 deletions pvlib/tracking.py
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,8 @@ def get_aoi(self, surface_tilt, surface_azimuth, solar_zenith,

For a given set of solar zenith and azimuth angles, the
surface tilt and azimuth parameters are typically determined
by :py:method:`~SingleAxisTracker.singleaxis`. The
:py:method:`~SingleAxisTracker.singleaxis` method also returns
by :py:meth:`~SingleAxisTracker.singleaxis`. The
:py:meth:`~SingleAxisTracker.singleaxis` method also returns
the angle of incidence, so this method is only needed
if using a different tracking algorithm.

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
'optional': ['cython', 'ephem', 'netcdf4', 'nrel-pysam', 'numba',
'pvfactors', 'siphon', 'statsmodels', 'tables',
'cftime >= 1.1.1'],
'doc': ['ipython', 'matplotlib', 'sphinx == 1.8.5', 'sphinx_rtd_theme',
'doc': ['ipython', 'matplotlib', 'sphinx >= 3.1.2', 'sphinx_rtd_theme',
'sphinx-gallery', 'docutils == 0.15.2', 'pillow',
'netcdf4', 'siphon', 'tables'],
'test': TESTS_REQUIRE
Expand Down