update to conform with new bioframe and pandas 1.4.0

open2c · Feb 11, 2022 · ac36a82 · ac36a82
1 parent 36bd13d
commit ac36a82
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/cooltools/api/eigdecomp.py b/cooltools/api/eigdecomp.py
@@ -471,9 +471,9 @@ def _each(region):
     # output table eigvec_table and eigvals_table
     for _region, _eigvals, _eigvecs in results:
         idx = bioframe.select(eigvec_table, _region).index
-        eigvec_table.at[idx, eigvec_columns] = _eigvecs.T
+        eigvec_table.loc[idx, eigvec_columns] = _eigvecs.T
         idx = bioframe.select(eigvals_table, _region).index
-        eigvals_table.at[idx, eigval_columns] = _eigvals
+        eigvals_table.loc[idx, eigval_columns] = _eigvals
 
     return eigvals_table, eigvec_table
 

diff --git a/cooltools/sandbox/expected_smoothing.py b/cooltools/sandbox/expected_smoothing.py
@@ -214,7 +214,7 @@ def _agg_smooth_cvd(
     cvd, groupby, sigma_log10, window_sigma, points_per_sigma, cols=None
 ):
     if groupby:
-        cvd = cvd.groupby(groupby).apply(
+        cvd = cvd.set_index(groupby).groupby(groupby).apply(
             _smooth_cvd_group,
             sigma_log10=sigma_log10,
             window_sigma=window_sigma,

diff --git a/tests/test_expected.py b/tests/test_expected.py
@@ -107,7 +107,7 @@ def _blocksum_asymm_dense(matrix, bad_bin_rows=None, bad_bin_cols=None):
     common_regions.append(reg1)
     common_regions.append(reg2)
 
-view_df = bioframe.make_viewframe(common_regions)
+view_df = bioframe.make_viewframe(common_regions, name_style='ucsc')
 
 
 def test_diagsum_symm(request):