Skip to content

Commit

Permalink
updated description of the package
Browse files Browse the repository at this point in the history
  • Loading branch information
frkunz committed Mar 18, 2016
1 parent 4ff320e commit 4714049
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
10 changes: 5 additions & 5 deletions processing.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -362,10 +362,10 @@
"\n",
"name: opsd-national-generation-capacities\n",
"title: Aggregated generation capacity by technology and country\n",
"description: This dataset comprises technology-specific aggregated generation capacities for European countries.\n",
"version: \"2016-03-07\"\n",
"description: This dataset comprises technology-specific aggregated generation capacities for European countries. The generation capacities are consistently categorized based on fuel and technology. For each European country, various references are used ranging from international (e.g. ENTSOE or EUROSTAT) to national sources from e.g. regulatory authorities. The input data is processed in the script linked below. \n",
"version: \"2016-03-18\"\n",
"keywords: [national generation capacities,europe]\n",
"opsd-jupyter-notebook-url: \"https://github.com/Open-Power-System-Data/datapackage_national_generation_capacities/blob/master/National_Generation_Capacities.ipynb\"\n",
"opsd-jupyter-notebook-url: \"https://github.com/Open-Power-System-Data/datapackage_national_generation_capacities/blob/master/main.ipynb\"\n",
"geographical-scope: Europe\n",
"opsd-changes-to-last-version: Restructured script and added new countries to dataset\n",
"\n",
Expand Down Expand Up @@ -481,7 +481,7 @@
" web: http://data.csb.gov.lv/pxweb/en/vide/vide__ikgad__energetika/EN0130.px/table/tableViewLayout1/?rxid=a79839fe-11ba-4ecd-8cc3-4035692c5fc8\n",
" - name: Energy Ministry NO 2013\n",
" web: https://www.regjeringen.no/globalassets/upload/oed/faktaheftet/facts_energy_water.pdf\n",
" - name: Energy Ministry NO 2013 \n",
" - name: Energy Ministry NO 2015 \n",
" web: https://www.regjeringen.no/contentassets/fd89d9e2c39a4ac2b9c9a95bf156089a/facts_2015_energy_and_water_web.pdf \n",
" - name: REN\n",
" web: http://www.ren.pt/files/2015-05/2015-05-04145306_f7664ca7-3a1a-4b25-9f46-2056eef44c33$$72f445d4-8e31-416a-bd01-d7b980134d0f$$ee3c56e5-6d14-4aa0-ac1f-ca5006917e03$$storage_image$$pt$$1.pdf\n",
Expand Down Expand Up @@ -538,7 +538,7 @@
"data.to_excel(output_path+'aggregated_capacity.xlsx', sheet_name='output')\n",
"\n",
"#Write the results to sql database\n",
"data.to_sql(output_path+'aggregated_capacity', sqlite3.connect('aggregated_capacity.sqlite'), if_exists=\"replace\") \n",
"data.to_sql(output_path+'aggregated_capacity', sqlite3.connect(output_path+'aggregated_capacity.sqlite'), if_exists=\"replace\") \n",
"\n",
"#Write the information of the metadata\n",
"with open(os.path.join(output_path, 'datapackage.json'), 'w') as f:\n",
Expand Down
6 changes: 1 addition & 5 deletions tests.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,7 @@
"nb_root_logger = logging.getLogger()\n",
"formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s',\n",
" datefmt='%d %b %Y %H:%M:%S')\n",
"nb_root_logger.handlers[0].setFormatter(formatter)\n",
"\n",
"#create download and output folder if they do not exist\n",
"if not os.path.exists('output/'): os.makedirs('output/')\n",
"if not os.path.exists('output/datapackage_generation_capacities'): os.makedirs('output/datapackage_generation_capacities')"
"nb_root_logger.handlers[0].setFormatter(formatter)"
]
},
{
Expand Down

0 comments on commit 4714049

Please sign in to comment.