Merge pull request #8 from OpenEnergyPlatform/hotfix/release-v1.0.0

Hotfix release v 1.0.0
OpenEnergyPlatform · Aug 25, 2020 · 1c73eb8 · 1c73eb8
2 parents a738abf + b91f408
commit 1c73eb8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...apackage/OEDataModel-normalization-datapackage/OEDataModel-normalization-datapackage.json b/...apackage/OEDataModel-normalization-datapackage/OEDataModel-normalization-datapackage.json
@@ -92,12 +92,12 @@
             {"name": "parameter_name", "description": "", "type": "text", "unit": null},
             {"name": "technology", "description": "", "type": "text", "unit": null},
             {"name": "technology_type", "description": "", "type": "text", "unit": null},
+            {"name": "type", "description": "vlaue: scalar or timeseries indicate the related table", "type": "text", "unit": null},
             {"name": "unit", "description": "Parameter unit", "type": "text", "unit": null},
             {"name": "tags", "description": "Free classification with key-value pairs", "type": "hstore", "unit": null},
             {"name": "method", "description": "Method type (sum, mean, median)", "type": "json", "unit": null},
             {"name": "source", "description": "Source", "type": "text", "unit": null},
-            {"name": "comment", "description": "Comment", "type": "text", "unit": null},
-            {"name": "type", "description": "vlaue: scalar or timeseries indicate the related table", "type": "text", "unit": null} ],
+            {"name": "comment", "description": "Comment", "type": "text", "unit": null}],
         "primaryKey": ["scalar_id"],
         "foreignKeys": [{
                 "fields": ["data_id"],

diff --git a/...kage/OEDataModel-normalization-datapackage/OEDataModel-normalization-datapackage_data.csv b/...kage/OEDataModel-normalization-datapackage/OEDataModel-normalization-datapackage_data.csv
@@ -1 +1 @@
-data_id;scenario_id;region;input_energy_vector;output_energy_vector;parameter_name;technology;technology_type;unit;tags;method;source;comment;type
+data_id;scenario_id;region;input_energy_vector;output_energy_vector;parameter_name;technology;technology_type;type;unit;tags;method;source;comment