updated doc and changelog

IndEcol · Aug 12, 2019 · 265d4f6 · 265d4f6
1 parent 5251a01
commit 265d4f6
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 3 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -3,7 +3,7 @@ Changelog
 #########
 
 ***************************
-v0.4.0 (under development)
+v0.4.0 (August 12, 2019)
 ***************************
 
 New features
@@ -24,6 +24,9 @@ Backward incompatible changes
 ==============================
 
 * Minimum python version changed to 3.7
+* The FY and SY matrixes has been renamed to F_Y and S_Y. Previously stored 
+  data, however, can still be read (FY/SY files are automatically parsed as F_Y 
+  and S_Y)
 
 ***************************
 v0.3.8 (November 06, 2018)

diff --git a/doc/source/api_doc/pymrio.download_oecd.rst b/doc/source/api_doc/pymrio.download_oecd.rst
@@ -0,0 +1,6 @@
+pymrio.download\_oecd
+=====================
+
+.. currentmodule:: pymrio
+
+.. autofunction:: download_oecd
diff --git a/doc/source/api_doc/pymrio.parse_oecd.rst b/doc/source/api_doc/pymrio.parse_oecd.rst
@@ -0,0 +1,6 @@
+pymrio.parse\_oecd
+==================
+
+.. currentmodule:: pymrio
+
+.. autofunction:: parse_oecd
diff --git a/doc/source/api_references.rst b/doc/source/api_references.rst
@@ -23,18 +23,20 @@ Download MRIO databases
 ===========================
 
 Download publicly EE MRIO databases from the web.
-This is currently implemented for the WIOD_ database
+This is currently implemented for the WIOD_ and OECD_ICIO_ database
 (EXIOBASE_ and EORA26_ require registration before downloading).
 
 
 .. _EXIOBASE: http://www.exiobase.eu/
 .. _WIOD: http://www.wiod.org/home
+.. _OECD_ICIO: https://www.oecd.org/sti/ind/inter-country-input-output-tables.htm
 .. _EORA26: http://www.worldmrio.com/simplified/
 
 .. autosummary::
     :toctree: api_doc/
 
     download_wiod2013
+    download_oecd
 
 Raw data
 ========
@@ -48,6 +50,7 @@ Raw data
     generic_exiobase12_parser
     parse_wiod
     parse_eora26
+    parse_oecd
 
 
 Save data

diff --git a/doc/source/terminology.rst b/doc/source/terminology.rst
@@ -26,7 +26,7 @@ other names and abbreviations often found in the literature):
 +---------------+----------------------------------------------+----------------------+------------------------------------+---------------------------------------------------------------------------------------------------------------------------------+
 | S             |  factor production coefficients              | D                    | stressor coefficients              |                                                                                                                                 |
 +---------------+----------------------------------------------+----------------------+------------------------------------+---------------------------------------------------------------------------------------------------------------------------------+
-| S_            |  factor production coefficients final demand | DY, yD, Shh          |                                    | Factor inputs/emissions coefficients of the final demand, eg the emissions from housholds                                       |
+| S_Y           |  factor production coefficients final demand | DY, yD, Shh          |                                    | Factor inputs/emissions coefficients of the final demand, eg the emissions from housholds                                       |
 +---------------+----------------------------------------------+----------------------+------------------------------------+---------------------------------------------------------------------------------------------------------------------------------+
 | D_cba         |  consumption based accounts                  | fp, con              | footprints, consumption footprints | footprint of consumption, further specification with  reg (per region) or  cap (per capita) possible                            |
 +---------------+----------------------------------------------+----------------------+------------------------------------+---------------------------------------------------------------------------------------------------------------------------------+