Skip to content

Commit

Permalink
rebuild docs for v3.7
Browse files Browse the repository at this point in the history
  • Loading branch information
@konstantinstadler
konstantinstadler committed Oct 22, 2018
1 parent 1748a5e commit 4806471
Show file tree
Hide file tree
Showing 13 changed files with 255 additions and 231 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,10 @@ Removed functionality
Misc
====

* pymrio now depends on python > 3.6
* Stressed the issue driven development in CONTRIBUTING.rst


***********************
v0.3.6 (March 12, 2018)
***********************
Expand Down
6 changes: 0 additions & 6 deletions doc/source/api_doc/pymrio.download_eora26.rst
View file

This file was deleted.

6 changes: 6 additions & 0 deletions doc/source/api_doc/pymrio.parse_exiobase3.rst
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pymrio\.parse\_exiobase3
========================

.. currentmodule:: pymrio

.. autofunction:: parse_exiobase3
7 changes: 3 additions & 4 deletions doc/source/api_references.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ Download MRIO databases
===========================

Download publicly EE MRIO databases from the web.
This is currently implemented for the WIOD_ and EORA26_ database
(EXIOBASE_ requires registration before downloading).
This is currently implemented for the WIOD_ database
(EXIOBASE_ and EORA26_ require registration before downloading).


.. _EXIOBASE: http://www.exiobase.eu/
Expand All @@ -35,8 +35,6 @@ This is currently implemented for the WIOD_ and EORA26_ database
:toctree: api_doc/

download_wiod2013
download_eora26


Raw data
========
Expand All @@ -46,6 +44,7 @@ Raw data

parse_exiobase1
parse_exiobase2
parse_exiobase3
generic_exiobase12_parser
parse_wiod
parse_eora26
Expand Down
10 changes: 5 additions & 5 deletions doc/source/notebooks/aggregation_examples.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
{
"data": {
"text/plain": [
"<pymrio.core.mriosystem.IOSystem at 0x7fba581e2a20>"
"<pymrio.core.mriosystem.IOSystem at 0x7f24d9077160>"
]
},
"execution_count": 2,
Expand Down Expand Up @@ -135,7 +135,7 @@
{
"data": {
"text/plain": [
"<pymrio.core.mriosystem.IOSystem at 0x7fba581e2a20>"
"<pymrio.core.mriosystem.IOSystem at 0x7f24d9077160>"
]
},
"execution_count": 5,
Expand Down Expand Up @@ -173,7 +173,7 @@
{
"data": {
"text/plain": [
"<pymrio.core.mriosystem.IOSystem at 0x7fba581e2a20>"
"<pymrio.core.mriosystem.IOSystem at 0x7f24d9077160>"
]
},
"execution_count": 7,
Expand Down Expand Up @@ -532,7 +532,7 @@
{
"data": {
"text/plain": [
"<pymrio.core.mriosystem.IOSystem at 0x7fba500bb518>"
"<pymrio.core.mriosystem.IOSystem at 0x7f24cd8ddd68>"
]
},
"execution_count": 18,
Expand Down Expand Up @@ -736,7 +736,7 @@
{
"data": {
"text/plain": [
"<pymrio.core.mriosystem.IOSystem at 0x7fba395005f8>"
"<pymrio.core.mriosystem.IOSystem at 0x7f24cd53b0b8>"
]
},
"execution_count": 24,
Expand Down
54 changes: 28 additions & 26 deletions doc/source/notebooks/autodownload.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
},
"outputs": [],
"source": [
"wiod_folder = '/tmp/mrios/WIOD2013'"
"wiod_folder = '/tmp/mrios/autodownload/WIOD2013'"
]
},
{
Expand Down Expand Up @@ -120,18 +120,18 @@
"MRIO Name: WIOD\n",
"System: ixi\n",
"Version: data13\n",
"File: /tmp/mrios/WIOD2013/metadata.json\n",
"File: /tmp/mrios/autodownload/WIOD2013/metadata.json\n",
"History:\n",
"20180912 09:17:19 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/water/wat_may12.zip to wat_may12.zip\n",
"20180912 09:17:18 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/materials/mat_may12.zip to mat_may12.zip\n",
"20180912 09:17:18 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/land/lan_may12.zip to lan_may12.zip\n",
"20180912 09:17:18 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/AIR/AIR_may12.zip to AIR_may12.zip\n",
"20180912 09:17:17 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/CO2/CO2_may12.zip to CO2_may12.zip\n",
"20180912 09:17:17 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/EM/EM_may12.zip to EM_may12.zip\n",
"20180912 09:17:16 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/EU/EU_may12.zip to EU_may12.zip\n",
"20180912 09:17:15 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/SEA/WIOD_SEA_July14.xlsx to WIOD_SEA_July14.xlsx\n",
"20180912 09:17:14 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/update_sep12/wiot/wiot09_row_sep12.xlsx to wiot09_row_sep12.xlsx\n",
"20180912 09:17:13 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/wiot_analytic/wiot04_row_apr12.xlsx to wiot04_row_apr12.xlsx\n",
"20181022 14:09:45 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/water/wat_may12.zip to wat_may12.zip\n",
"20181022 14:09:45 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/materials/mat_may12.zip to mat_may12.zip\n",
"20181022 14:09:44 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/land/lan_may12.zip to lan_may12.zip\n",
"20181022 14:09:44 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/AIR/AIR_may12.zip to AIR_may12.zip\n",
"20181022 14:09:43 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/CO2/CO2_may12.zip to CO2_may12.zip\n",
"20181022 14:09:43 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/EM/EM_may12.zip to EM_may12.zip\n",
"20181022 14:09:42 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/EU/EU_may12.zip to EU_may12.zip\n",
"20181022 14:09:41 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/SEA/WIOD_SEA_July14.xlsx to WIOD_SEA_July14.xlsx\n",
"20181022 14:09:41 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/update_sep12/wiot/wiot09_row_sep12.xlsx to wiot09_row_sep12.xlsx\n",
"20181022 14:09:39 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/wiot_analytic/wiot04_row_apr12.xlsx to wiot04_row_apr12.xlsx\n",
" ... (more lines in history)\n"
]
}
Expand Down Expand Up @@ -290,11 +290,13 @@
"Version: data13\n",
"File: /tmp/foo_folder/WIOD2013_res/metadata.json\n",
"History:\n",
"20180912 09:18:21 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/CO2/CO2_may12.zip to CO2_may12.zip\n",
"20180912 09:18:21 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/EU/EU_may12.zip to EU_may12.zip\n",
"20180912 09:18:20 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/wiot_analytic/wiot04_row_apr12.xlsx to wiot04_row_apr12.xlsx\n",
"20180912 09:18:19 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/wiot_analytic/wiot97_row_apr12.xlsx to wiot97_row_apr12.xlsx\n",
"20180912 09:18:18 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/wiot_analytic/wiot05_row_apr12.xlsx to wiot05_row_apr12.xlsx\n"
"20181022 14:08:41 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/wiot_analytic/wiot01_row_apr12.xlsx to wiot01_row_apr12.xlsx\n",
"20181022 14:08:40 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/wiot_analytic/wiot00_row_apr12.xlsx to wiot00_row_apr12.xlsx\n",
"20181022 14:08:39 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/CO2/CO2_may12.zip to CO2_may12.zip\n",
"20181022 14:08:38 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/EU/EU_may12.zip to EU_may12.zip\n",
"20181022 14:08:37 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/wiot_analytic/wiot04_row_apr12.xlsx to wiot04_row_apr12.xlsx\n",
"20181022 14:08:36 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/wiot_analytic/wiot97_row_apr12.xlsx to wiot97_row_apr12.xlsx\n",
"20181022 14:08:35 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/wiot_analytic/wiot05_row_apr12.xlsx to wiot05_row_apr12.xlsx\n"
]
}
],
Expand Down Expand Up @@ -347,13 +349,13 @@
"Version: data13\n",
"File: /tmp/foo_folder/WIOD2013_res/metadata.json\n",
"History:\n",
"20180912 09:18:24 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/wiot_analytic/wiot01_row_apr12.xlsx to wiot01_row_apr12.xlsx\n",
"20180912 09:18:23 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/wiot_analytic/wiot00_row_apr12.xlsx to wiot00_row_apr12.xlsx\n",
"20180912 09:18:21 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/CO2/CO2_may12.zip to CO2_may12.zip\n",
"20180912 09:18:21 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/EU/EU_may12.zip to EU_may12.zip\n",
"20180912 09:18:20 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/wiot_analytic/wiot04_row_apr12.xlsx to wiot04_row_apr12.xlsx\n",
"20180912 09:18:19 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/wiot_analytic/wiot97_row_apr12.xlsx to wiot97_row_apr12.xlsx\n",
"20180912 09:18:18 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/wiot_analytic/wiot05_row_apr12.xlsx to wiot05_row_apr12.xlsx\n"
"20181022 14:08:41 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/wiot_analytic/wiot01_row_apr12.xlsx to wiot01_row_apr12.xlsx\n",
"20181022 14:08:40 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/wiot_analytic/wiot00_row_apr12.xlsx to wiot00_row_apr12.xlsx\n",
"20181022 14:08:39 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/CO2/CO2_may12.zip to CO2_may12.zip\n",
"20181022 14:08:38 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/EU/EU_may12.zip to EU_may12.zip\n",
"20181022 14:08:37 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/wiot_analytic/wiot04_row_apr12.xlsx to wiot04_row_apr12.xlsx\n",
"20181022 14:08:36 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/wiot_analytic/wiot97_row_apr12.xlsx to wiot97_row_apr12.xlsx\n",
"20181022 14:08:35 - FILEIO - Downloaded http://www.wiod.org/protected3/data13/wiot_analytic/wiot05_row_apr12.xlsx to wiot05_row_apr12.xlsx\n"
]
}
],
Expand Down Expand Up @@ -402,7 +404,7 @@
"metadata": {
"anaconda-cloud": {},
"kernelspec": {
"display_name": "Python [default]",
"display_name": "Python 3",
"language": "python",
"name": "python3"
},
Expand All @@ -416,7 +418,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.5.2"
"version": "3.6.3"
}
},
"nbformat": 4,
Expand Down
4 changes: 2 additions & 2 deletions doc/source/notebooks/buildflowmatrix.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -889,7 +889,7 @@
{
"data": {
"text/plain": [
"<pymrio.core.mriosystem.IOSystem at 0x7f251808f518>"
"<pymrio.core.mriosystem.IOSystem at 0x7f4fc2eeb128>"
]
},
"execution_count": 7,
Expand Down Expand Up @@ -2251,7 +2251,7 @@
{
"data": {
"text/plain": [
"<pymrio.core.mriosystem.IOSystem at 0x7f251808f518>"
"<pymrio.core.mriosystem.IOSystem at 0x7f4fc2eeb128>"
]
},
"execution_count": 14,
Expand Down
26 changes: 13 additions & 13 deletions doc/source/notebooks/load_save_export.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
{
"data": {
"text/plain": [
"<pymrio.core.mriosystem.IOSystem at 0x7fc5a0617128>"
"<pymrio.core.mriosystem.IOSystem at 0x7fe54f2f0128>"
]
},
"execution_count": 2,
Expand Down Expand Up @@ -106,16 +106,16 @@
"Version: v1\n",
"File: /tmp/testmrio/full/metadata.json\n",
"History:\n",
"20180907 13:35:15 - FILEIO - Added satellite account from /tmp/testmrio/full/factor_inputs\n",
"20180907 13:35:15 - FILEIO - Added satellite account from /tmp/testmrio/full/emissions\n",
"20180907 13:35:15 - FILEIO - Loaded IO system from /tmp/testmrio/full\n",
"20180907 13:35:15 - FILEIO - Saved testmrio to /tmp/testmrio/full\n",
"20180907 13:35:15 - MODIFICATION - Calculating accounts for extension emissions\n",
"20180907 13:35:15 - MODIFICATION - Calculating accounts for extension factor_inputs\n",
"20180907 13:35:15 - MODIFICATION - Leontief matrix L calculated\n",
"20180907 13:35:15 - MODIFICATION - Coefficient matrix A calculated\n",
"20180907 13:35:15 - MODIFICATION - Industry output x calculated\n",
"20180907 13:35:15 - FILEIO - Load test_mrio from /home/konstans/proj/pymrio/pymrio/mrio_models/test_mrio\n",
"20181022 14:11:29 - FILEIO - Added satellite account from /tmp/testmrio/full/factor_inputs\n",
"20181022 14:11:29 - FILEIO - Added satellite account from /tmp/testmrio/full/emissions\n",
"20181022 14:11:29 - FILEIO - Loaded IO system from /tmp/testmrio/full\n",
"20181022 14:11:29 - FILEIO - Saved testmrio to /tmp/testmrio/full\n",
"20181022 14:11:29 - MODIFICATION - Calculating accounts for extension emissions\n",
"20181022 14:11:29 - MODIFICATION - Calculating accounts for extension factor_inputs\n",
"20181022 14:11:29 - MODIFICATION - Leontief matrix L calculated\n",
"20181022 14:11:29 - MODIFICATION - Coefficient matrix A calculated\n",
"20181022 14:11:29 - MODIFICATION - Industry output x calculated\n",
"20181022 14:11:29 - FILEIO - Load test_mrio from /home/konstans/proj/pymrio/pymrio/mrio_models/test_mrio\n",
" ... (more lines in history)"
]
},
Expand Down Expand Up @@ -446,7 +446,7 @@
{
"data": {
"text/plain": [
"<pymrio.core.mriosystem.Extension at 0x7fc5a0617630>"
"<pymrio.core.mriosystem.Extension at 0x7fe54f2f0630>"
]
},
"execution_count": 14,
Expand Down Expand Up @@ -484,7 +484,7 @@
{
"data": {
"text/plain": [
"<pymrio.core.mriosystem.Extension at 0x7fc5980bb588>"
"<pymrio.core.mriosystem.Extension at 0x7fe54431ceb8>"
]
},
"execution_count": 16,
Expand Down
Loading

0 comments on commit 4806471

Please sign in to comment.