Merge pull request #55 from IMMM-SFA/dev

JOSS Review:  Bring in data from external source

.github/workflows/build.yml

@@ -27,6 +27,7 @@ jobs:
           run: |
             python -m pip install --upgrade pip
             python setup.py install
+            python -c 'import cerf; cerf.install_package_data()'
 
         - name: Test and generate coverage report on Linux
           run: |

.gitignore

@@ -1,5 +1,11 @@
-cerf/data/*_dist_m.tif
-cerf/data/cerf_transmission_*
+cerf/data/*.zip
+cerf/data/*.tif
+cerf/data/*.yml
+cerf/data/*.csv
+cerf/data/*.xml
+cerf/data/*.sdat
+cerf/data/*.sgrd
+cerf/data/*.img
 
 # ignore docs build
 docs/build/

MANIFEST.in

@@ -1,3 +1,3 @@
-include cerf/data/*
+include cerf/data/README.md
 include tests/data/*
 include tests/data/comp_data/*

cerf/__init__.py

@@ -5,6 +5,7 @@
 from .interconnect import *
 from .lmp import *
 from .utils import *
+from .install_supplement import install_package_data
 
 
-__version__ = "2.0.2"
+__version__ = "2.0.3"

cerf/compete.py

@@ -192,6 +192,7 @@ def compete(self):
                         self.sited_dict['state_name'].append(self.target_state_name)
                         self.sited_dict['tech_id'].append(tech_id)
                         self.sited_dict['tech_name'].append(self.technology_dict[tech_id]['tech_name'])
+                        self.sited_dict['unit_size_mw'].append(self.technology_dict[tech_id]['unit_size'])
                         self.sited_dict['xcoord'].append(self.xcoords[target_ix])
                         self.sited_dict['ycoord'].append(self.ycoords[target_ix])
                         self.sited_dict['index'].append(self.indices_flat[target_ix])

cerf/data/README.md

@@ -0,0 +1,8 @@
+Space holder for package data.  Install the cerf package data by running:
+
+```python 
+import cerf
+
+cerf.install_package_data()
+
+```