Merge pull request #72 from wind-python/hotfix/#71

Fix access to renamed oedb table

Author: uvchik

doc/whats_new.rst

@@ -8,8 +8,9 @@ These are new features and improvements of note in each release
     :local:
     :backlinks: top
 
+.. include::  whatsnew/v0-1-3.txt
 .. include::  whatsnew/v0-1-2.txt
 .. include::  whatsnew/v0-1-1.txt
 .. include::  whatsnew/v0-1-0.txt
 .. include::  whatsnew/v006.txt
-.. include::  whatsnew/v005.txt
+.. include::  whatsnew/v005.txt

doc/whatsnew/v0-1-3.txt

@@ -0,0 +1,11 @@
+v0.1.3 (September 2, 2019)
+++++++++++++++++++++++++++++++
+
+Bug fixes
+#########
+* Acces to renamed oedb table has been fixed (`Issue #71 <https://github.com/wind-python/windpowerlib/issues/71>`_).
+
+Contributors
+############
+* Birgit Schachler
+* Uwe Krien

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',
+      install_requires=['pandas >= 0.19.1, < 0.26',
                         'requests < 3.0'],
       extras_require={
           'dev': ['pytest', 'jupyter', 'sphinx_rtd_theme', 'nbformat']})

windpowerlib/wind_turbine.py

@@ -360,7 +360,7 @@ def load_turbine_data_from_oedb():
     oep_url = 'http://oep.iks.cs.ovgu.de/'
     # location of data
     schema = 'supply'
-    table = 'turbine_library'
+    table = 'wind_turbine_library'
     # load data
     result = requests.get(
         oep_url + '/api/v0/schema/{}/tables/{}/rows/?'.format(
@@ -394,9 +394,8 @@ def load_turbine_data_from_oedb():
         # add nominal power to power (coefficient) data frame
         curves_df = pd.merge(
             left=curves_df, right=turbine_data[['turbine_type',
-                                                'installed_capacity']],
-            on='turbine_type').set_index('turbine_type').rename(
-                columns={'installed_capacity': 'nominal_power'})
+                                                'nominal_power']],
+            on='turbine_type').set_index('turbine_type')
         curves_df.to_csv(filename.format('{}s'.format(curve_type)))
 
     return turbine_data