Merge pull request #133 from rl-institut/release/v1.0.1

Release/v1.0.1

.pylintrc

@@ -7,7 +7,7 @@ extension-pkg-whitelist=
 
 # Add files or directories to the blacklist. They should be base names, not
 # paths.
-ignore=CVS,config,saio_table_models.py
+ignore=CVS,config,saio_table_models.py,oep_models.py
 
 # Add files or directories matching the regex patterns to the blacklist. The
 # regex matches against base names, not paths.

CHANGELOG.md

@@ -17,6 +17,21 @@ Here is a template for new release sections
 -
 ```
 
+## [v1.0.1] - 2020-02-12
+
+### Added
+- new migration 
+
+### Changed
+- csvrow table now has field "hights"
+- oep_models OEP schemas
+- saio_table_models OEP schemas
+- pylintr ignores oep_models.py 
+
+### Removed
+- unnecessary OEP schemas
+
+
 ## [1.0.0] - 2019-09-19
 
 ### Added

oep_models.py

@@ -28,7 +28,7 @@
 
 
 # ##########################################SQLAlchemy setup########################################
-SCHEMA_1 = 'model_draft'
+SCHEMA_1 = 'climate'
 SCHEMA_2 = 'supply'
 engine = sah.get_engine('oep_engine')
 metadata_1 = MetaData(schema=SCHEMA_1, bind=engine)
@@ -196,4 +196,4 @@ class OpenFredTimesSeries(Base):
 # contains open_FRED related tables as SQLAlchemy class
 open_fred_classes = mapped_classes(metadata_1)
 ego_dp_res_classes = ppr_mapping(metadata_2)
-open_fred_ts_classes = ts_mapping(metadata_1)
+open_fred_ts_classes = ts_mapping(metadata_2)

saio_table_models.py

@@ -1,6 +1,6 @@
 import sqlahelper as sah
 import saio
 
-saio.register_schema("model_draft", sah.get_engine('oep_engine'))
-from saio.model_draft import openfred_feedin_wind_2016 as Timeseries
-from saio.model_draft import openfred_powerplants as Powerplants
+saio.register_schema("supply", sah.get_engine('oep_engine'))
+from saio.supply import openfred_feedin_wind_2016 as Timeseries
+from saio.supply import openfred_powerplants as Powerplants

serial_views.py

@@ -518,6 +518,7 @@ def wseries_fetch_data_single_point(request):
             CsvRow.objects.all().delete()
             for record in oep_query:
                 timespan_id = record.Series.timespan_id
+
                 height = record.Series.height
 
                 if timespan_id not in timespan_ids: