merge "remove_vernetzen_server" into "dev"

Author: uvchik

doc/whatsnew/v004.txt

@@ -4,6 +4,8 @@ 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
 #############
@@ -24,4 +26,4 @@ Other changes
 Contributors
 ############
 
- * name
+ * Uwe Krien

example/basic_example.py

@@ -3,8 +3,6 @@
 
 import pandas as pd
 import logging
-import os
-import requests
 
 try:
     from matplotlib import pyplot as plt
@@ -40,37 +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))
-        req = requests.get(url)
-        with open(filename, 'wb') as fout:
-            fout.write(req.content)
-
-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)