Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump pytest-mock from 3.11.1 to 3.14.0 #310

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
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
18 changes: 9 additions & 9 deletions example/example_run.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,20 +41,20 @@
tasks="All",
networks="STRING",
features="SixSpeciesN2V",
sp_trn = "Human",
sp_tst = "Mouse",
gsc= "GO",
sp_trn="Human",
sp_tst="Mouse",
gsc="GO",
)

# Run through the pipeline
# First initialize the geneplexus object
myclass = geneplexus.GenePlexus(
file_loc = fp_data,
gsc = "Combined",
features = "SixSpeciesN2V",
net_type = "STRING",
sp_trn = "Human",
sp_tst = "Mouse",
file_loc=fp_data,
gsc="Combined",
features="SixSpeciesN2V",
net_type="STRING",
sp_trn="Human",
sp_tst="Mouse",
)

# Load the input genes into the class and set up positives/negatives
Expand Down
6 changes: 3 additions & 3 deletions geneplexus/geneplexus.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
from ._config import logger
from ._config.logger_util import set_stream_level
from .download import download_select_data
from .exception import CustomDataError, ZebrafishBioGRIDError
from .exception import CustomDataError
from .exception import ZebrafishBioGRIDError


class GenePlexus:
Expand Down Expand Up @@ -88,14 +89,13 @@ def __init__(

if input_genes is not None:
self.load_genes(input_genes)

if ("Zebrafish" == (self.sp_trn or self.sp_tst)) and (self.net_type == "BioGRID"):
raise ZebrafishBioGRIDError(
f"The BioGRID network for Zebrafish is not "
"included due to it not having enough nodes "
"so this combination is not allowed.",
)


@property
def _params(self) -> List[str]:
Expand Down
2 changes: 1 addition & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ pytest-cov==4.1.0
pytest-order==1.1.0
parameterized==0.9.0
requests-mock==1.11.0
pytest-mock==3.11.1
pytest-mock==3.14.0
Loading