Merge branch 'master' into dev

Author: SabineHaas

doc/whatsnew/v0-1-2.txt

@@ -5,17 +5,17 @@ New features
 ############
 * new attribute `nominal_power` in :class:`~windpowerlib.wind_farm.WindFarm` and :class:`~windpowerlib.wind_turbine_cluster.WindTurbineCluster` classes (PR #53)
 * use properties and setters for `nominal_power` and `installed_power` in :class:`~windpowerlib.wind_farm.WindFarm` and  :class:`~windpowerlib.wind_turbine_cluster.WindTurbineCluster` classes
-* added csv files containing turbine data from `OpenEnergy Database (oedb) <https://openenergy-platform.org/dataedit/>`_ to the repository
+* made windpowerlib work offline: added csv files containing turbine data from `OpenEnergy Database (oedb) <https://openenergy-platform.org/dataedit/>`_ to the repository for offline usage (PR #52)
+
 
 Bug fixes
 #########
 * fixed issue with pandas Multiindex labels and codes attributes (PR #51)
 
 Other changes
 #############
-* made windpowerlib work offline: turbine data from oedb is stored in csv files for offline usage (PR #52)
 * made :py:func:`~windpowerlib.wind_turbine.get_turbine_types` also accessible via `get_turbine_types()` --> from windpowerlib import get_turbine_types
-* added kwargs in init of  :class:`~windpowerlib.wind_turbine.WindTurbine`, :class:`~windpowerlib.wind_farm.WindFarm` and  :class:`~windpowerlib.wind_turbine_cluster.WindTurbineCluster`
+* added kwargs in init of :class:`~windpowerlib.wind_turbine.WindTurbine`, :class:`~windpowerlib.wind_farm.WindFarm` and  :class:`~windpowerlib.wind_turbine_cluster.WindTurbineCluster`
 * we are working with deprecation warnings to draw our user's attention to important changes (PR #53)
 
 Deprecations

setup.py

@@ -18,7 +18,7 @@ def read(fname):
           'windpowerlib': [os.path.join('data', '*.csv')]},
       long_description=read('README.rst'),
       zip_safe=False,
-      install_requires=['pandas >= 0.19.1, < 0.25.0',
-                        'requests'],
+      install_requires=['pandas >= 0.19.1, < 0.25',
+                        'requests < 3.0'],
       extras_require={
           'dev': ['pytest', 'jupyter', 'sphinx_rtd_theme', 'nbformat']})