Closed gschivley closed 4 years ago
@WesIngwersen There are a few more changes from @jump2conclusionsmatt coming through on this PR but I wanted to get it in your queue. I didn't get as far with merging the two methods as I would have liked but I think we've made a significant push.
In combinator.py, ln 17 and 20 'sheetname' must be replaced with 'sheet_name' because of pandas deprecation of sheetname
I'm getting an error in reading in EIA fuel receipts in read_eia_923_fuel_receipts File "C:\Users\wesle\AppData\Local\Programs\Python\Python37\lib\site-packages\xlrdinit.py", line 157, in open_workbook ragged_rows=ragged_rows, File "C:\Users\wesle\AppData\Local\Programs\Python\Python37\lib\site-packages\xlrd\book.py", line 92, in open_workbook_xls biff_version = bk.getbof(XL_WORKBOOK_GLOBALS) File "C:\Users\wesle\AppData\Local\Programs\Python\Python37\lib\site-packages\xlrd\book.py", line 1278, in getbof bof_error('Expected BOF record; found %r' % self.mem[savpos:savpos+8]) File "C:\Users\wesle\AppData\Local\Programs\Python\Python37\lib\site-packages\xlrd\book.py", line 1272, in bof_error raise XLRDError('Unsupported format, or corrupt file: ' + msg xlrd.biffh.XLRDError: Unsupported format, or corrupt file: Expected BOF record; found b'Plant Id'
Sorry about this - this has actually already been done in a pull request to Schivley's master that should automatically get pulled into this request on acceptance.
I approved the PR by @jump2conclusionsmatt to this branch. Should be accessible here now.
This is a big PR with lots of changes. Some are smaller (docstrings on some of the existing EPA functions) but many are major.
New NETL methods:
groupby
rather than nestedfor
loops (talk to @jump2conclusionsmatt about this).Change the settings/config file file from JSON to YAML:
model_config.py
to select the YAML file instead of JSON files.Add a main.py:
Other changes (not comprehensive):
generation.py
in two, just to make it a little easier and allow users to output data part-way through as a dataframe if they want to.eia923_generation.py
).__init__.py
so that they can output results for either the existing EPA or new NETL methods.