Merge pull request #39 from wind-python/fix/bug_#38

Fixes #38 by adapting csv reading to pandas API change

Author: SabineHaas

example/modelchain_example.ipynb

@@ -122,15 +122,17 @@
     "            os.path.dirname(__file__))[0], 'example')\n",
     "    file = os.path.join(kwargs['datapath'], filename)\n",
     "    # read csv file \n",
-    "    weather_df = pd.read_csv(file, index_col=0, header=[0, 1])\n",
+    "    weather_df = pd.read_csv(\n",
+    "        file, index_col=0, header=[0, 1],\n",
+    "        date_parser=lambda idx: pd.to_datetime(idx, utc=True))\n",
     "    # change type of index to datetime and set time zone\n",
-    "    weather_df.index = pd.to_datetime(weather_df.index).tz_localize(\n",
-    "        'UTC').tz_convert('Europe/Berlin')\n",
+    "    weather_df.index = pd.to_datetime(weather_df.index).tz_convert(\n",
+    "        'Europe/Berlin')\n",
     "    # change type of height from str to int by resetting columns\n",
     "    weather_df.columns = [weather_df.axes[1].levels[0][\n",
-    "                              weather_df.axes[1].labels[0]],\n",
+    "                              weather_df.axes[1].codes[0]],\n",
     "                          weather_df.axes[1].levels[1][\n",
-    "                              weather_df.axes[1].labels[1]].astype(int)]\n",
+    "                              weather_df.axes[1].codes[1]].astype(int)]\n",
     "    return weather_df\n",
     "\n",
     "\n",

example/modelchain_example.py

@@ -72,15 +72,17 @@ def get_weather_data(filename='weather.csv', **kwargs):
             os.path.dirname(__file__))[0], 'example')
     file = os.path.join(kwargs['datapath'], filename)
     # read csv file
-    weather_df = pd.read_csv(file, index_col=0, header=[0, 1])
+    weather_df = pd.read_csv(
+        file, index_col=0, header=[0, 1],
+        date_parser=lambda idx: pd.to_datetime(idx, utc=True))
     # change type of index to datetime and set time zone
-    weather_df.index = pd.to_datetime(weather_df.index).tz_localize(
-        'UTC').tz_convert('Europe/Berlin')
+    weather_df.index = pd.to_datetime(weather_df.index).tz_convert(
+        'Europe/Berlin')
     # change type of height from str to int by resetting columns
     weather_df.columns = [weather_df.axes[1].levels[0][
-                              weather_df.axes[1].labels[0]],
+                              weather_df.axes[1].codes[0]],
                           weather_df.axes[1].levels[1][
-                              weather_df.axes[1].labels[1]].astype(int)]
+                              weather_df.axes[1].codes[1]].astype(int)]
     return weather_df
 
 

setup.py

@@ -16,5 +16,5 @@ def read(fname):
           'windpowerlib': [os.path.join('data', '*.csv')]},
       long_description=read('README.rst'),
       zip_safe=False,
-      install_requires=['pandas >= 0.19.1',
+      install_requires=['pandas >= 0.19.1, < 0.25 ',
                         'requests'])