Merge branch 'master' into dev

Author: chilango74

okama/assets.py

@@ -561,6 +561,7 @@ def get_cagr(self, period: Optional[int] = None, real: bool = False) -> pd.Serie
         CNYUSD.FX   -0.017922
         dtype: float64
         """
+        # TODO: add "real" attribute
         df = self._add_inflation()
         dt0 = self.last_date
         if period is None:

okama/portfolio.py

@@ -531,7 +531,11 @@ def describe(self, years: Tuple[int] = (1, 5, 10)) -> pd.DataFrame:
                     else:
                         row = {"portfolio": value}
                 else:
-                    row = {x: None for x in df.columns} if hasattr(self, "inflation") else {'portfolio': None}
+                    row = (
+                        {x: None for x in df.columns}
+                        if hasattr(self, "inflation")
+                        else {"portfolio": None}
+                    )
                 row.update(period=f"{i} years", rebalancing="1 year", property="CAGR")
                 description = description.append(row, ignore_index=True)
             # CAGR for full period (rebalanced 1 year)