Skip to content

Commit d6eece8

Browse files
authored
Miscellaneous sphinx fixes (#1365)
* clean up internal links * fix the pvlib-maintainer tagging instructions * clean up surfrad.py * update ad location for new theme version * pin theme version * update broken wfcsv.pdf links * switch to just tagging pvlib, not the untaggable pvlib-maintainer team * fix silly md/rst confusion
1 parent 95e25fd commit d6eece8

File tree

8 files changed

+16
-17
lines changed

8 files changed

+16
-17
lines changed

docs/sphinx/source/conf.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@
159159
"use_edit_page_button": True,
160160
"show_toc_level": 1,
161161
"footer_items": ["copyright", "sphinx-version", "sidebar-ethical-ads"],
162+
"left_sidebar_end": [],
162163
}
163164

164165
# Add any paths that contain custom themes here, relative to this directory.
@@ -199,9 +200,7 @@
199200
#html_use_smartypants = True
200201

201202
# Custom sidebar templates, maps document names to template names.
202-
html_sidebars = {
203-
"**": ["search-field", "sidebar-nav-bs"] # "sidebar-ethical-ads"
204-
}
203+
# html_sidebars = {}
205204

206205
# Additional templates that should be rendered to pages, maps page names to
207206
# template names.

docs/sphinx/source/contributing.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,13 +150,14 @@ a timely manner is to:
150150

151151
#. Start by creating an issue. The issue should be well-defined and
152152
actionable.
153-
#. Ask the maintainers to tag the issue with the appropriate milestone.
153+
#. Ask the `maintainers <https://github.com/orgs/pvlib/people>`_ to tag
154+
the issue with the appropriate milestone.
154155
#. Make a limited-scope pull request. It can be a lot of work to check all of
155156
the boxes in `pull request guidelines
156157
<https://github.com/pvlib/pvlib-python/blob/master/.github/PULL_REQUEST_TEMPLATE.md>`_,
157158
especially for pull requests with a lot of new primary code.
158159
See :ref:`pull-request-scope`.
159-
#. Tag pvlib community members or ``@pvlib/maintainer`` when the pull
160+
#. Tag pvlib community members or ``@pvlib`` when the pull
160161
request is ready for review. (see :ref:`pull-request-reviews`)
161162

162163

@@ -166,7 +167,7 @@ Pull request reviews
166167
--------------------
167168

168169
The pvlib community and maintainers will review your pull request in a
169-
timely fashion. Please "ping" ``@pvlib/maintainer`` if it seems that
170+
timely fashion. Please "ping" ``@pvlib`` if it seems that
170171
your pull request has been forgotten at any point in the pull request
171172
process.
172173

docs/tutorials/irradiance.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@
367367
"source": [
368368
"See the online documentation for clear sky modeling examples.\n",
369369
"\n",
370-
"http://pvlib-python.readthedocs.io/en/latest/clearsky.html\n",
370+
"http://pvlib-python.readthedocs.io/en/stable/user_guide/clearsky.html\n",
371371
"\n",
372372
"Here we only generate data for the functions below."
373373
]

pvlib/iotools/midc.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,8 @@ def read_midc(filename, variable_map={}, raw_data=False, **kwargs):
187187
{'Global Horizontal [W/m^2]': 'ghi'}
188188
189189
See the MIDC_VARIABLE_MAP for collection of mappings by site.
190-
For a full list of pvlib variable names see the `Variable Style Rules
191-
<https://pvlib-python.readthedocs.io/en/latest/variables_style_rules.html>`_.
190+
For a full list of pvlib variable names see the
191+
:ref:`variables_style_rules`.
192192
193193
Be sure to check the units for the variables you will use on the
194194
`MIDC site <https://midcdmz.nrel.gov/>`_.

pvlib/iotools/psm3.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ def parse_psm3(fbuf):
262262
.. [1] `NREL National Solar Radiation Database (NSRDB)
263263
<https://nsrdb.nrel.gov/>`_
264264
.. [2] `Standard Time Series Data File Format
265-
<https://rredc.nrel.gov/solar/old_data/nsrdb/2005-2012/wfcsv.pdf>`_
265+
<https://web.archive.org/web/20170207203107/https://sam.nrel.gov/sites/default/files/content/documents/pdf/wfcsv.pdf>`_
266266
"""
267267
# The first 2 lines of the response are headers with metadata
268268
metadata_fields = fbuf.readline().split(',')
@@ -331,7 +331,7 @@ def read_psm3(filename):
331331
.. [1] `NREL National Solar Radiation Database (NSRDB)
332332
<https://nsrdb.nrel.gov/>`_
333333
.. [2] `Standard Time Series Data File Format
334-
<https://rredc.nrel.gov/solar/old_data/nsrdb/2005-2012/wfcsv.pdf>`_
334+
<https://web.archive.org/web/20170207203107/https://sam.nrel.gov/sites/default/files/content/documents/pdf/wfcsv.pdf>`_
335335
"""
336336
with open(str(filename), 'r') as fbuf:
337337
content = parse_psm3(fbuf)

pvlib/iotools/surfrad.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def read_surfrad(filename, map_variables=True):
4747
Filepath or url.
4848
map_variables: bool
4949
When true, renames columns of the Dataframe to pvlib variable names
50-
where applicable. See variable SURFRAD_COLUMNS.
50+
where applicable. See variable :const:`VARIABLE_MAP`.
5151
5252
Returns
5353
-------
@@ -113,7 +113,7 @@ def read_surfrad(filename, map_variables=True):
113113
======================= ====== ==========================================
114114
115115
See README files located in the station directories in the SURFRAD
116-
data archives[2]_ for details on SURFRAD daily data files.
116+
data archives [2]_ for details on SURFRAD daily data files.
117117
118118
References
119119
----------

pvlib/modelchain.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,8 +382,7 @@ class ModelChain:
382382
appropriate model parameters. For example, if ``dc_model='pvwatts'``,
383383
then each ``Array.module_parameters`` must contain ``'pdc0'``.
384384
385-
See https://pvlib-python.readthedocs.io/en/stable/modelchain.html
386-
for examples.
385+
See :ref:`modelchaindoc` for examples.
387386
388387
Parameters
389388
----------

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
'pvfactors', 'siphon', 'statsmodels',
5858
'cftime >= 1.1.1'],
5959
'doc': ['ipython', 'matplotlib', 'sphinx == 3.1.2',
60-
'pydata-sphinx-theme', 'sphinx-gallery', 'docutils == 0.15.2',
61-
'pillow', 'netcdf4', 'siphon',
60+
'pydata-sphinx-theme == 0.8.0', 'sphinx-gallery',
61+
'docutils == 0.15.2', 'pillow', 'netcdf4', 'siphon',
6262
'sphinx-toggleprompt >= 0.0.5'],
6363
'test': TESTS_REQUIRE
6464
}

0 commit comments

Comments
 (0)