Merge branch 'master' of https://github.com/WattTime/pyiso into 142_fix_nvenergyclient

Author: r24mille

pyiso/eu.py

@@ -301,6 +301,7 @@ def parse_response(self, response):
                         'ba_name': self.options['control_area'],
                         'market': 'RTHR',
                         'timestamp': timestamp,
+                        'freq': 'n/a',
                     }
                     if (self.options['forecast']):
                         datapoint['market'] = 'DAM'

pyiso/miso.py

@@ -13,7 +13,8 @@
 class MISOClient(BaseClient):
     NAME = 'MISO'
 
-    base_url = 'https://www.misoenergy.org'
+    base_url = 'https://api.misoenergy.org/MISORTWDDataBroker/DataBrokerServices.asmx'
+    docs_url = 'https://docs.misoenergy.org/marketreports/'
 
     fuels = {
         'Coal': 'coal',
@@ -95,7 +96,7 @@ def get_trade(self, latest=False, **kwargs):
 
     def get_latest_fuel_mix(self):
         # set up request
-        url = self.base_url + '/ria/FuelMix.aspx?CSV=True'
+        url = self.base_url + '?messageType=getfuelmix&returnType=csv'
 
         # carry out request
         response = self.request(url)
@@ -116,7 +117,7 @@ def parse_latest_fuel_mix(self, content):
             return pd.DataFrame()
 
         # preliminary parsing
-        df = pd.read_csv(BytesIO(content), header=0, index_col=0, parse_dates=True)
+        df = pd.read_csv(BytesIO(content), header=0, index_col=0, skiprows=2, parse_dates=True)
 
         # set index
         try:
@@ -144,7 +145,7 @@ def handle_forecast(self):
     def fetch_forecast(self, date):
         # construct url
         datestr = date.strftime('%Y%m%d')
-        url = self.base_url + '/Library/Repository/Market%20Reports/' + datestr + '_da_ex.xls'
+        url = self.docs_url +  datestr + '_da_ex.xls'
 
         # make request with self.request for easier debugging, mocking
         response = self.request(url)

tests/unit/test_miso.py

@@ -18,6 +18,6 @@ def test_utcify(self):
         self.assertEqual(ts.tzinfo, pytz.utc)
 
     def test_parse_latest_fuel_mix_bad(self):
-        bad_content = b'header1,header2\nnotadate,2016-01-01'
+        bad_content = b'header1,header2\n\nnotadate,2016-01-01'
         data = self.c.parse_latest_fuel_mix(bad_content)
         self.assertEqual(len(data), 0)