Merge branch 'dev' into features/#169-renaming-gid-and-subst_id

CHANGELOG.rst

@@ -204,6 +204,12 @@ Changed
   `#397 <https://github.com/openego/eGon-data/issues/397>`_
 * Rename columns gid to id
   `#169 <https://github.com/openego/eGon-data/issues/169>`_
+* Use random seed from CLI parameters for CHP and society prognosis functions
+  `#351 <https://github.com/openego/eGon-data/issues/351>`_
+* Changed demand.egon_schmidt_industrial_sites - table and merged table (industrial_sites)
+  `#423 <https://github.com/openego/eGon-data/issues/423>`_
+* Adjust file path for industrial sites import
+  `#397 <https://github.com/openego/eGon-data/issues/418>`_
 
 Bug fixes
 ---------

src/egon/data/airflow/dags/pipeline.py

@@ -52,6 +52,11 @@
 import egon.data.processing.loadarea as loadarea
 import egon.data.processing.power2gas as power2gas
 import egon.data.processing.substation as substation
+import egon.data.processing.gas_areas as gas_areas
+import egon.data.processing.loadarea as loadarea
+import egon.data.processing.calculate_dlr as dlr
+
+
 
 from egon.data import db
 
@@ -204,6 +209,7 @@
         autocommit=True,
     )
 
+
     osm_add_metadata >> substation_tables >> substation_functions
     substation_functions >> hvmv_substation_extraction
     substation_functions >> ehv_substation_extraction
@@ -449,7 +455,7 @@
     # Industry
 
     industrial_sites = MergeIndustrialSites(
-        dependencies=[setup, vg250_clean_and_prepare]
+        dependencies=[setup, vg250_clean_and_prepare, data_bundle]
     )
 
     demand_curves_industry = IndustrialDemandCurves(

src/egon/data/datasets/chp/small_chp.py

@@ -141,7 +141,7 @@ def extension_to_areas(areas, additional_capacity, existing_chp, flh, EgonChp,
     """
     session = sessionmaker(bind=db.engine())()
 
-    np.random.seed(seed=123456)
+    np.random.seed(seed=config.settings()['egon-data']['--random-seed'])
 
     # n = 0
     # Add new CHP as long as the additional capacity is not reached