Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ repos:
- id: check-case-conflict

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.14.1
rev: v0.14.7
hooks:
- id: ruff
types_or: [python, pyi, jupyter]
Expand Down
6 changes: 3 additions & 3 deletions bioframe/core/checks.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ def is_overlapping(df, cols=None):
"""
from ..ops import merge

ck1, sk1, ek1 = _get_default_colnames() if cols is None else cols
_ck1, sk1, ek1 = _get_default_colnames() if cols is None else cols

df_merged = merge(df, cols=cols)

Expand Down Expand Up @@ -297,8 +297,8 @@ def is_contained(
"""
from ..ops import trim

ck1, sk1, ek1 = _get_default_colnames() if cols is None else cols
ck2, sk2, ek2 = _get_default_colnames() if cols_view is None else cols_view
_ck1, sk1, ek1 = _get_default_colnames() if cols is None else cols
_ck2, sk2, ek2 = _get_default_colnames() if cols_view is None else cols_view
if df_view_col is None:
try:
df_view_assigned = ops.overlap(df, view_df, cols1=cols, cols2=cols_view)
Expand Down
2 changes: 1 addition & 1 deletion bioframe/core/construction.py
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ def make_viewframe(
view_df:dataframe satisfying properties of a view

"""
ck1, sk1, ek1 = _get_default_colnames() if cols is None else cols
ck1, _sk1, _ek1 = _get_default_colnames() if cols is None else cols

view_df = from_any(regions, name_col=view_name_col, cols=cols)

Expand Down
10 changes: 5 additions & 5 deletions bioframe/ops.py
Original file line number Diff line number Diff line change
Expand Up @@ -880,8 +880,8 @@ def coverage(

"""

ck1, sk1, ek1 = _get_default_colnames() if cols1 is None else cols1
ck2, sk2, ek2 = _get_default_colnames() if cols2 is None else cols2
_ck1, sk1, ek1 = _get_default_colnames() if cols1 is None else cols1
_ck2, _sk2, _ek2 = _get_default_colnames() if cols2 is None else cols2

df1.reset_index(inplace=True, drop=True)

Expand Down Expand Up @@ -1365,8 +1365,8 @@ def setdiff(df1, df2, cols1=None, cols2=None, on=None):
df_setdiff : pandas.DataFrame

"""
ck1, sk1, ek1 = _get_default_colnames() if cols1 is None else cols1
ck2, sk2, ek2 = _get_default_colnames() if cols2 is None else cols2
_ck1, _sk1, _ek1 = _get_default_colnames() if cols1 is None else cols1
_ck2, _sk2, _ek2 = _get_default_colnames() if cols2 is None else cols2

events1, _ = _overlap_intidxs(
df1, df2, how="inner", cols1=cols1, cols2=cols2, on=on
Expand Down Expand Up @@ -1866,7 +1866,7 @@ def assign_view(

"""

ck1, sk1, ek1 = _get_default_colnames() if cols is None else cols
_ck1, sk1, ek1 = _get_default_colnames() if cols is None else cols

df = df.copy()
df.reset_index(inplace=True, drop=True)
Expand Down