diff --git a/docs/environment.yml b/docs/environment.yml index 030b14facb..8f059a76bc 100644 --- a/docs/environment.yml +++ b/docs/environment.yml @@ -1,22 +1,24 @@ 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 - - numpy + - numpy=1.11.2 - scipy - - pandas + - pandas=0.19.1 - pytz - ephem - numba - ipython=4.0.1 - ipywidgets - numpydoc - - matplotlib - - seaborn -# - siphon - - sphinx=1.3.5 # same versions as rtd - - sphinx_rtd_theme=0.1.7 - - docutils=0.12 + - matplotlib=1.5.3 + - seaborn=0.7.1 + - siphon=0.4.0 + - sphinx=1.4.8 + - netCDF4=1.2.4 + - hdf4=4.2.12 + - sphinx_rtd_theme + - docutils diff --git a/docs/sphinx/source/forecasts.rst b/docs/sphinx/source/forecasts.rst index 8ff3c17efc..efc25059b0 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=fx_data); 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