Merge pull request #4 from rickecon/prrathi-master

Update version number and jdebacker review comments
PSLmodels · Apr 22, 2023 · fc2e081 · fc2e081
2 parents fa23622 + 1c93aff
commit fc2e081
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/ogcore/__init__.py b/ogcore/__init__.py
@@ -19,4 +19,4 @@
 from ogcore.txfunc import *
 from ogcore.utils import *
 
-__version__ = "0.10.7"
+__version__ = "0.10.8"
diff --git a/ogcore/txfunc.py b/ogcore/txfunc.py
@@ -367,7 +367,7 @@ def get_tax_rates(
                     ]
                     for t in range(income.shape[0])
                 ]
-        txrates = np.array(txrates)
+        txrates = np.squeeze(np.array(txrates))
 
     return txrates
 
@@ -821,7 +821,7 @@ def txfunc_est(
             splines=[100, 100],
         )
         wsse = wsse_cstr
-        params = mono_interp
+        params = [mono_interp]
         params_to_plot = params
     else:
         raise RuntimeError(

diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="ogcore",
-    version="0.10.7",
+    version="0.10.8",
     author="Jason DeBacker and Richard W. Evans",
     license="CC0 1.0 Universal (CC0 1.0) Public Domain Dedication",
     description="A general equilibribum overlapping generations model for fiscal policy analysis",