From 70fea0f0a322ce971547605ba6b16bd479d33120 Mon Sep 17 00:00:00 2001 From: Kevin Anderson Date: Tue, 9 Jun 2020 21:54:28 -0600 Subject: [PATCH 1/3] Create make.bat --- docs/sphinx/make.bat | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 docs/sphinx/make.bat diff --git a/docs/sphinx/make.bat b/docs/sphinx/make.bat new file mode 100644 index 0000000000..9534b01813 --- /dev/null +++ b/docs/sphinx/make.bat @@ -0,0 +1,35 @@ +@ECHO OFF + +pushd %~dp0 + +REM Command file for Sphinx documentation + +if "%SPHINXBUILD%" == "" ( + set SPHINXBUILD=sphinx-build +) +set SOURCEDIR=source +set BUILDDIR=build + +if "%1" == "" goto help + +%SPHINXBUILD% >NUL 2>NUL +if errorlevel 9009 ( + echo. + echo.The 'sphinx-build' command was not found. Make sure you have Sphinx + echo.installed, then set the SPHINXBUILD environment variable to point + echo.to the full path of the 'sphinx-build' executable. Alternatively you + echo.may add the Sphinx directory to PATH. + echo. + echo.If you don't have Sphinx installed, grab it from + echo.http://sphinx-doc.org/ + exit /b 1 +) + +%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O% +goto end + +:help +%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O% + +:end +popd From 1b74f536a70bde4b2899df046af43b6a9cc2d3c7 Mon Sep 17 00:00:00 2001 From: Kevin Anderson Date: Fri, 12 Jun 2020 19:16:23 -0600 Subject: [PATCH 2/3] whatsnew --- docs/sphinx/source/whatsnew/v0.8.0.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/sphinx/source/whatsnew/v0.8.0.rst b/docs/sphinx/source/whatsnew/v0.8.0.rst index dc6bf5015c..ebffa4b610 100644 --- a/docs/sphinx/source/whatsnew/v0.8.0.rst +++ b/docs/sphinx/source/whatsnew/v0.8.0.rst @@ -23,6 +23,8 @@ Documentation * Clarify units for heat loss factors in :py:func:`pvlib.temperature.pvsyst_cell` and :py:func:`pvlib.temperature.faiman`. (:pull:`960`) +* Add make.bat so that docs can be built on Windows without ``make`` installed. + (:issue:`978`, :pull:`981`) Requirements ~~~~~~~~~~~~ From c927dff0f8ce3d1ca9eb607865f55b1b8bd58e0e Mon Sep 17 00:00:00 2001 From: Kevin Anderson Date: Thu, 9 Jul 2020 19:18:23 -0600 Subject: [PATCH 3/3] resolve sapm2 equation name conflict --- pvlib/temperature.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pvlib/temperature.py b/pvlib/temperature.py index 7828293afb..c9f77c5424 100644 --- a/pvlib/temperature.py +++ b/pvlib/temperature.py @@ -213,7 +213,7 @@ def sapm_cell_from_module(module_temperature, poa_global, deltaT, Total incident irradiance [W/m^2]. deltaT : float - Parameter :math:`\Delta T` in :eq:`sapm2` [C]. + Parameter :math:`\Delta T` in :eq:`sapm2_cell_from_mod` [C]. irrad_ref : float, default 1000 Reference irradiance, parameter :math:`E_{0}` in @@ -228,7 +228,7 @@ def sapm_cell_from_module(module_temperature, poa_global, deltaT, The model for cell temperature :math:`T_{C}` is given by Eq. 12 in [1]_. .. math:: - :label: sapm2 + :label: sapm2_cell_from_mod T_{C} = T_{m} + \frac{E}{E_{0}} \Delta T