Fix test warnings

ogcore/SS.py

@@ -427,7 +427,7 @@ def inner_loop(outer_loop_vars, p, client):
     C_vec = np.zeros(p.I)
     K_demand_open_vec = np.zeros(p.M)
     for i_ind in range(p.I):
-        C_vec[i_ind] = aggr.get_C(c_i[i_ind, :, :], p, "SS")
+        C_vec[i_ind] = aggr.get_C(c_i[i_ind, :, :], p, "SS").item()
     Y_vec = np.dot(p.io_matrix.T, C_vec)
     for m_ind in range(p.M - 1):
         KYrat_m = firm.get_KY_ratio(r, p_m, p, "SS", m_ind)
@@ -994,7 +994,7 @@ def SS_solver(
             c_i_ss_mat[i_ind, :, :],
             p,
             "SS",
-        )
+        ).item()
 
     (
         total_tax_revenue,

ogcore/parameter_plots.py

@@ -49,13 +49,12 @@ def plot_imm_rates(
         "Source: " + source,
         fontsize=9,
     )
-    plt.tight_layout(rect=(0, 0.035, 1, 1))
     if include_title:
         plt.title("Immigration Rates")
     # Save or return figure
     if path:
         output_path = os.path.join(path, "imm_rates")
-        plt.savefig(output_path, dpi=300)
+        plt.savefig(output_path, bbox_inches="tight", dpi=300)
         plt.close()
     else:
         fig.show()
@@ -407,11 +406,10 @@ def plot_fert_rates(
         "Source: " + source,
         fontsize=9,
     )
-    plt.tight_layout(rect=(0, 0.035, 1, 1))
     # Save or return figure
     if path:
         output_path = os.path.join(path, "fert_rates")
-        plt.savefig(output_path, dpi=300)
+        plt.savefig(output_path, bbox_inches="tight", dpi=300)
         plt.close()
     else:
         fig.show()
@@ -816,7 +814,7 @@ def txfunc_graph(
         None
 
     """
-    cmap1 = matplotlib.cm.get_cmap("summer")
+    cmap1 = matplotlib.colormaps.get_cmap("summer")
 
     # Make comparison plot with full income domains
     fig = plt.figure()

ogcore/parameter_tables.py

@@ -192,7 +192,7 @@ def param_table(p, table_format="tex", path=None):
         table["Symbol"].append(v[1])
         table["Description"].append(v[0])
         value = getattr(p, k)
-        if hasattr(value, "__len__") & ~isinstance(value, str):
+        if hasattr(value, "__len__") and not isinstance(value, str):
             if value.ndim > 1:
                 report = (
                     "Too large to report here, see default parameters JSON"

pytest.ini

@@ -1,5 +1,9 @@
 # pytest.ini
 [pytest]
+filterwarnings =
+    ignore::RuntimeWarning:.*invalid value encountered.*
+    ignore::RuntimeWarning:.*divide by zero encountered in divide.*
+    ignore::RuntimeWarning:.*invalid value encountered in power.*
 minversion = 6.0
 testpaths =
     ./tests

tests/test_aggregates.py

@@ -31,7 +31,10 @@
     for i in range(p.S):
         for k in range(p.J):
             L_loop[t, i, k] *= (
-                p.omega[t, i] * p.lambdas[k] * n[t, i, k] * p.e[t, i, k]
+                p.omega[t, i].item()
+                * p.lambdas[k].item()
+                * n[t, i, k].item()
+                * p.e[t, i, k].item()
             )
 expected1 = L_loop[-1, :, :].sum()
 expected2 = L_loop.sum(1).sum(1)