Merge branch 'dev' of github.com:wind-python/windpowerlib into dev

Conflicts:
	setup.py

Author: Birgit Schachler

VERSION

@@ -1 +1 @@
-__version__ = "0.0.2dev"
+__version__ = "0.0.4"

doc/conf.py

@@ -61,7 +61,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.0.1'
+version = '0.0.3'
 # The full version, including alpha/beta/rc tags.
 #release = 'beta'
 

doc/whats_new.rst

@@ -8,5 +8,6 @@ These are new features and improvements of note in each release
     :local:
     :backlinks: top
 
-.. include::  whatsnew/v002.txt
+.. include::  whatsnew/v004.txt
+.. include::  whatsnew/v003.txt
 .. include::  whatsnew/v001.txt

doc/whatsnew/v002.txt

@@ -1,27 +1,19 @@
-v0.0.2 ()
+v0.0.3 (November 18, 2016)
 +++++++++++++++++++++++++
 
-New features
-############
-
-
-Documentation
-#############
-
-
-Testing
-####### 
-
-
-Bug fixes
-#########
-
 
 Other changes
 #############
-
+Allow installation of windpowerlib for python versions >3.4
+Import requests package instead of urllib5
 
 Contributors
 ############
 
- * name
+ * Uwe Krien
+ * Stephen Bosch
+ * Birgit Schachler
+
+Comment
+#######
+Release of v0.0.2 has been skipped due to a mistake in the release process.

doc/whatsnew/v003.txt

@@ -0,0 +1,29 @@
+v0.0.4 ()
++++++++++++++++++++++++++
+
+New features
+############
+
+* cp-values database file is now part of the repository and will be installed using pip/setup.py. The former download server was down due to technical problems and it might be safer not to be reliant on an external server.
+
+
+Documentation
+#############
+
+
+Testing
+####### 
+
+
+Bug fixes
+#########
+
+
+Other changes
+#############
+
+
+Contributors
+############
+
+ * Uwe Krien

doc/whatsnew/v004.txt

@@ -3,8 +3,6 @@
 
 import pandas as pd
 import logging
-import os
-from urllib.request import urlretrieve
 
 try:
     from matplotlib import pyplot as plt
@@ -40,36 +38,14 @@
     'wind_conv_type': 'VESTAS V 90 3000'}
 
 
-def download_file(filename, url):
-    if not os.path.isfile(filename):
-        logging.info('Copying weather data from {0} to {1}'.format(
-            url, filename))
-        urlretrieve(url, filename)
-
-
-def fetch_example_files():
-    basic_path = os.path.join(os.path.expanduser("~"), '.oemof')
-    filename_1 = os.path.join(basic_path, 'weather.csv')
-    url1 = 'http://vernetzen.uni-flensburg.de/~git/weather.csv'
-    filename_2 = os.path.join(basic_path, 'weather_wittenberg.csv')
-    url2 = 'http://vernetzen.uni-flensburg.de/~git/weather_wittenberg.csv'
-    if not os.path.exists(basic_path):
-        os.makedirs(basic_path)
-    download_file(filename_1, url1)
-    download_file(filename_2, url2)
-    return filename_1, filename_2
-
-
 def ready_example_data(filename, datetime_column='Unnamed: 0'):
     df = pd.read_csv(filename)
     return df.set_index(pd.to_datetime(df[datetime_column])).tz_localize(
         'UTC').tz_convert('Europe/Berlin').drop(datetime_column, 1)
 
 
-filename1, filename2 = fetch_example_files()
-
 # Loading weather data
-weather_df = ready_example_data(filename1)
+weather_df = ready_example_data('weather.csv')
 
 e126 = basicmodel.SimpleWindTurbine(**enerconE126)
 v90 = basicmodel.SimpleWindTurbine(**vestasV90)

example/basic_example.py

@@ -3,22 +3,19 @@
 @author: uwe
 """
 
-import sys
+import os
 from setuptools import setup
 
-# check python version.
-if not sys.version_info[:2] in ((2, 7), (3, 3), (3, 4), (3, 5)):
-    sys.exit('%s requires Python 2.7, 3.3, 3.4 or 3.5' % 'feedinlib')
-
 setup(name='windpowerlib',
-      version='0.0.2dev',
+      version='0.0.4',
       description='Creating time series from wind power plants.',
       url='http://github.com/wind-python/windpowerlib',
       author='oemof developing group',
       author_email='mail',
       license=None,
       packages=['windpowerlib'],
+      package_data={
+            'windpowerlib': [os.path.join('data', '*.csv')]},
       zip_safe=False,
       install_requires=['numpy >= 1.7.0',
-                        'pandas >= 0.13.1',
-                        'urllib5'])
+                        'pandas >= 0.13.1'])

example/weather.csv

@@ -3,7 +3,6 @@
 import logging
 import numpy as np
 import pandas as pd
-from urllib.request import urlretrieve
 
 
 class SimpleWindTurbine:
@@ -293,7 +292,7 @@ def read_wpp_data(**kwargs):
     r"""
     Fetch cp values from a file or download it from a server.
 
-    The files are located in the ~/.oemof folder.
+    The files are located in the data folder of the package root.
 
     Returns
     -------
@@ -303,46 +302,21 @@ def read_wpp_data(**kwargs):
 
     Other Parameters
     ----------------
-    cp_path : string, optional
-        Path where the cp file is stored. Default: $HOME/.windpower
+    datapath : string, optional
+        Path where the cp file is stored. Default: '$PACKAGE_ROOT/data'
     filename : string, optional
-        Filename of the cp file without suffix. The suffix of the file should be
-        csv or hf5.
-    url : string, optional
-        URL from where the cp file is loaded if not present
-
-    Notes
-    -----
-    The files can be downloaded from
-    http://vernetzen.uni-flensburg.de/~git/
+        Filename of the cp file.
+
     """
-    default_cp_path = os.path.join(os.path.expanduser("~"), '.windpower')
-    cp_path = kwargs.get('cp_path', default_cp_path)
-    filename = kwargs.get('filename', 'cp_values')
-    filepath = os.path.join(cp_path, filename)
-    url = kwargs.get(
-        'url', 'http://vernetzen.uni-flensburg.de/~git/cp_values')
-    suffix = '.hf5'
-    if not os.path.exists(cp_path):
-        os.makedirs(cp_path)
-    if not os.path.isfile(filepath + suffix):
-        urlretrieve(url + suffix, filepath + suffix)
-        logging.info('Copying cp_values from {0} to {1}'.format(
-            url, filepath + suffix))
-    logging.debug('Retrieving cp values from {0}'.format(
-        filename + suffix))
-    try:
-        df = pd.read_hdf(filepath + suffix, 'cp')
-    except ValueError:
-        suffix = '.csv'
-        logging.info('Failed loading cp values from hdf file, trying csv.')
-        logging.debug('Retrieving cp values from {0}'.format(
-            filename + suffix))
-        if not os.path.isfile(filename + suffix):
-            urlretrieve(url + suffix, filename + suffix)
-            logging.info('Copying cp_values from {0} to {1}'.format(
-                url, filename + suffix))
-        df = pd.read_csv(filename + suffix, index_col=0)
+    if 'datapath' not in kwargs:
+        kwargs['datapath'] = os.path.join(os.path.dirname(__file__), 'data')
+
+    if 'filename' not in kwargs:
+        kwargs['filename'] = 'cp_values.csv'
+
+    cp_file = os.path.join(kwargs['datapath'], kwargs['filename'])
+
+    df = pd.read_csv(cp_file, index_col=0)
     return df
 
 
@@ -363,7 +337,7 @@ def get_wind_pp_types(print_out=True):
     (91, 2)
     >>> print(valid_types_df.iloc[5])
     rli_anlagen_id    DEWIND D8 2000
-    p_nenn                    2000.0
+    p_nenn                      2000
     Name: 5, dtype: object
     """
     df = read_wpp_data()