Merge branch 'dev'

Author: SabineHaas

.gitignore

@@ -35,7 +35,9 @@ pip-log.txt
 pip-delete-this-directory.txt
 
 # Doc
-doc/temp/
+doc/temp/*
+!doc/temp/windpowerlib.wind_farm.WindFarm.rst
+!doc/temp/windpowerlib.wind_turbine_cluster.WindTurbineCluster.rst
 .doctrees
 .buildinfo
 
@@ -96,3 +98,8 @@ ENV/
 
 # tests
 .pytest_cache
+
+# oedb data dump
+/windpowerlib/data/turbine_data_oedb.h5
+/windpowerlib/data/oedb_power_coefficient_curves.csv
+/windpowerlib/data/oedb_power_curves.csv

.travis.yml

@@ -14,7 +14,7 @@ matrix:
 
 install:
   - pip install .
-  - pip install coveralls sphinx nbformat pytest-cov jupyter
+  - pip install coveralls sphinx sphinx_rtd_theme nbformat pytest-cov jupyter
 
 # command to run tests
 script:

doc/conf.py

@@ -35,14 +35,23 @@
 # ones.
 extensions = [
     'sphinx.ext.autodoc',
+    'sphinx.ext.intersphinx',
+    'sphinx.ext.extlinks',  # enables external links with a key
     'sphinx.ext.viewcode',
     'sphinx.ext.imgmath',
     'sphinx.ext.napoleon',
     'sphinx.ext.autosummary',
     'nbsphinx'
-
 ]
 
+autodoc_member_order = 'bysource'
+
+extlinks = {'pandas':('http://pandas.pydata.org/pandas-docs/stable/reference/%s.html',
+                      'pandas.')
+            }
+# Example configuration for intersphinx: refer to the Python standard library.
+intersphinx_mapping = {'python': ('https://docs.python.org/3', None)}
+
 # 
 autoclass_content = 'both'
 
@@ -61,7 +70,7 @@
 # General information about the project.
 project = u'windpowerlib'
 copyright = u'2016, oemof developer group'
-author = u'oemof developing group'
+author = u'oemof developer group'
 
 import windpowerlib
 
@@ -117,11 +126,9 @@
 # -- Options for HTML output ----------------------------------------------
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-on_rtd = os.environ.get('READTHEDOCS') == 'True'
-if on_rtd:
-    html_theme = 'default'
-else:
-    html_theme = 'bizstyle'
+import sphinx_rtd_theme
+html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
+html_theme = 'sphinx_rtd_theme'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
@@ -285,9 +292,9 @@
 
 # Bibliographic Dublin Core info.
 epub_title = u'windpowerlib'
-epub_author = u'oemof developing group'
-epub_publisher = u'oemof developing group'
-epub_copyright = u'2016, oemof developing group'
+epub_author = u'oemof developer group'
+epub_publisher = u'oemof developer group'
+epub_copyright = u'2016, oemof developer group'
 
 # The basename for the epub file. It defaults to the project name.
 #epub_basename = u'pahesmf'

doc/model_description.rst

@@ -8,7 +8,7 @@ Wind power plants
 The windpowerlib provides three classes for modelling wind power as wind turbines (:py:class:`~.wind_turbine.WindTurbine`),
 wind farms (:py:class:`~.wind_farm.WindFarm`) and wind turbine clusters (:py:class:`~.wind_turbine_cluster.WindTurbineCluster`).
 
-Descisptions can also be found in the sections
+Descriptions can also be found in the sections
 :ref:`wind_turbine_label`, :ref:`wind_farm_label` and :ref:`wind_turbine_cluster_label`.
 
 
@@ -54,10 +54,10 @@ mean wind efficiency curve.
    :alt: Wind efficiency curves
    :align: center
 
-The second option of considering wake losses is applying them to power curves by reducing the power values
+The second option to consider wake losses is to apply them to power curves by reducing the power values
 by a constant or on a wind speed depending wind farm efficiency (see :py:func:`~.wake_losses_to_power_curve`).
-Applying the wind farm efficiency (curve) to power curves instead of to feed-in time series has the advantage that the
-power curves can further be aggregated to achieve turbine cluster power curves (see :py:class:`~.wind_turbine_cluster.WindTurbineCluster`).
+Applying the wind farm efficiency (curve) to power curves instead of feed-in time series has the advantage that the
+power curves can further be aggregated to obtain turbine cluster power curves (see :py:class:`~.wind_turbine_cluster.WindTurbineCluster`).
 
 Smoothing of power curves
 =========================