From 1e4f316e1397d1137ceeed0f44a16d904324bdbe Mon Sep 17 00:00:00 2001 From: Will Holmgren Date: Mon, 5 Dec 2016 17:47:47 -0700 Subject: [PATCH 1/4] try new doc env config --- docs/environment.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/environment.yml b/docs/environment.yml index 030b14facb..f3314ad87c 100644 --- a/docs/environment.yml +++ b/docs/environment.yml @@ -1,7 +1,7 @@ name: pvlibdocs channels: + - conda-forge - defaults -# - conda-forge # needed for siphon, but causes path too short problems on rtd dependencies: - python=2.7 - mock # needed for local python 2.7 builds @@ -16,7 +16,9 @@ dependencies: - numpydoc - matplotlib - seaborn -# - siphon - - sphinx=1.3.5 # same versions as rtd - - sphinx_rtd_theme=0.1.7 - - docutils=0.12 + - siphon + - sphinx=1.4.8 + - netCDF4=1.2.4 + - hdf4=4.2.12 + - sphinx_rtd_theme + - docutils From 24da9eea31f5b39cc3c21d46793a7f5cb74bdfdc Mon Sep 17 00:00:00 2001 From: Will Holmgren Date: Mon, 5 Dec 2016 18:02:38 -0700 Subject: [PATCH 2/4] pin more packages --- docs/environment.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/environment.yml b/docs/environment.yml index f3314ad87c..8f059a76bc 100644 --- a/docs/environment.yml +++ b/docs/environment.yml @@ -5,18 +5,18 @@ channels: dependencies: - python=2.7 - mock # needed for local python 2.7 builds - - numpy + - numpy=1.11.2 - scipy - - pandas + - pandas=0.19.1 - pytz - ephem - numba - ipython=4.0.1 - ipywidgets - numpydoc - - matplotlib - - seaborn - - siphon + - matplotlib=1.5.3 + - seaborn=0.7.1 + - siphon=0.4.0 - sphinx=1.4.8 - netCDF4=1.2.4 - hdf4=4.2.12 From 91cbc776e2fa1861bb677230a48b47e375c9d5cd Mon Sep 17 00:00:00 2001 From: Will Holmgren Date: Wed, 18 Jan 2017 10:19:06 -0700 Subject: [PATCH 3/4] fix warnings --- docs/sphinx/source/forecasts.rst | 4 +--- docs/sphinx/source/whatsnew/v0.3.0.txt | 2 +- docs/sphinx/source/whatsnew/v0.4.4.txt | 2 ++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/sphinx/source/forecasts.rst b/docs/sphinx/source/forecasts.rst index 8ff3c17efc..7d99f5b529 100644 --- a/docs/sphinx/source/forecasts.rst +++ b/docs/sphinx/source/forecasts.rst @@ -448,9 +448,7 @@ for details. mc = ModelChain(system, fx_model.location) # extract relevant data for model chain - irradiance = fx_data[['ghi', 'dni', 'dhi']] - weather = fx_data[['wind_speed', 'temp_air']] - mc.run_model(fx_data.index, irradiance=irradiance, weather=weather); + mc.run_model(fx_data.index, weather=weather); Now we plot a couple of modeling intermediates and the forecast power. Here's the forecast plane of array irradiance... diff --git a/docs/sphinx/source/whatsnew/v0.3.0.txt b/docs/sphinx/source/whatsnew/v0.3.0.txt index a1425e4506..0768c5dea4 100644 --- a/docs/sphinx/source/whatsnew/v0.3.0.txt +++ b/docs/sphinx/source/whatsnew/v0.3.0.txt @@ -48,7 +48,7 @@ Enhancements * :ref:`contributing` (:issue:`46`) * :ref:`timetimezones` (:issue:`47`) * :ref:`variables_style_rules` (:issue:`102`) - * :ref:`classes` (:issue:`93`) + * Classes (:issue:`93`) (Moved to :ref:`api` in :issue:`258`) * Adds support for Appveyor, a Windows continuous integration service. (:issue:`111`) diff --git a/docs/sphinx/source/whatsnew/v0.4.4.txt b/docs/sphinx/source/whatsnew/v0.4.4.txt index 9b237f6e74..48ff7da142 100644 --- a/docs/sphinx/source/whatsnew/v0.4.4.txt +++ b/docs/sphinx/source/whatsnew/v0.4.4.txt @@ -11,6 +11,8 @@ Documentation ~~~~~~~~~~~~~ * Fixes the Forecasting page's broken links to the tutorials. +* Fixes the Forecasting page's broken examples. (:issue:`299`) +* Fixes broken Classes link in the v0.3.0 documentation. Contributors From 51fa0a8529b1ee1c9654430e8974e5bb48e475c5 Mon Sep 17 00:00:00 2001 From: Will Holmgren Date: Wed, 18 Jan 2017 10:27:00 -0700 Subject: [PATCH 4/4] fix variable name --- docs/sphinx/source/forecasts.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sphinx/source/forecasts.rst b/docs/sphinx/source/forecasts.rst index 7d99f5b529..efc25059b0 100644 --- a/docs/sphinx/source/forecasts.rst +++ b/docs/sphinx/source/forecasts.rst @@ -448,7 +448,7 @@ for details. mc = ModelChain(system, fx_model.location) # extract relevant data for model chain - mc.run_model(fx_data.index, weather=weather); + mc.run_model(fx_data.index, weather=fx_data); Now we plot a couple of modeling intermediates and the forecast power. Here's the forecast plane of array irradiance...