Skip to content

Commit 0050085

Browse files
committed
Resolved importorskips prior to MaveDB imports
1 parent 03090af commit 0050085

File tree

1 file changed

+22
-13
lines changed

1 file changed

+22
-13
lines changed

tests/routers/test_experiment_set.py

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
1+
# ruff: noqa: E402
2+
13
import pytest
24
from unittest.mock import patch
5+
6+
arq = pytest.importorskip("arq")
7+
cdot = pytest.importorskip("cdot")
8+
fastapi = pytest.importorskip("fastapi")
9+
310
from mavedb.models.experiment import Experiment as ExperimentDbModel
411
from mavedb.models.experiment_set import ExperimentSet as ExperimentSetDbModel
512
from mavedb.models.score_set import ScoreSet as ScoreSetDbModel
@@ -12,10 +19,6 @@
1219
from tests.helpers.util.score_set import create_seq_score_set_with_variants, publish_score_set
1320
from tests.helpers.util.user import change_ownership
1421

15-
arq = pytest.importorskip("arq")
16-
cdot = pytest.importorskip("cdot")
17-
fastapi = pytest.importorskip("fastapi")
18-
1922

2023
def test_users_get_one_private_experiment_from_own_experiment_set(client, setup_router_db):
2124
experiment = create_experiment(client)
@@ -28,7 +31,8 @@ def test_users_get_one_private_experiment_from_own_experiment_set(client, setup_
2831

2932

3033
def test_users_get_one_experiment_one_score_set_from_own_private_experiment_set(
31-
session, data_provider, client, setup_router_db, data_files):
34+
session, data_provider, client, setup_router_db, data_files
35+
):
3236
experiment = create_experiment(client)
3337
score_set = create_seq_score_set_with_variants(
3438
client, session, data_provider, experiment["urn"], data_files / "scores.csv"
@@ -43,7 +47,8 @@ def test_users_get_one_experiment_one_score_set_from_own_private_experiment_set(
4347

4448

4549
def test_users_get_one_experiment_one_score_set_from_others_private_experiment_set(
46-
session, data_provider, client, setup_router_db, data_files):
50+
session, data_provider, client, setup_router_db, data_files
51+
):
4752
experiment = create_experiment(client)
4853
score_set = create_seq_score_set_with_variants(
4954
client, session, data_provider, experiment["urn"], data_files / "scores.csv"
@@ -85,7 +90,8 @@ def test_users_get_one_experiment_one_score_set_from_others_private_experiment_s
8590

8691

8792
def test_users_get_one_experiment_none_score_set_from_others_private_experiment_set(
88-
session, data_provider, client, setup_router_db, data_files):
93+
session, data_provider, client, setup_router_db, data_files
94+
):
8995
experiment = create_experiment(client)
9096
score_set = create_seq_score_set_with_variants(
9197
client, session, data_provider, experiment["urn"], data_files / "scores.csv"
@@ -118,7 +124,8 @@ def test_users_get_one_experiment_none_score_set_from_others_private_experiment_
118124

119125

120126
def test_users_get_none_experiment_none_score_set_from_others_private_experiment_set(
121-
session, data_provider, client, setup_router_db, data_files):
127+
session, data_provider, client, setup_router_db, data_files
128+
):
122129
experiment = create_experiment(client)
123130
score_set = create_seq_score_set_with_variants(
124131
client, session, data_provider, experiment["urn"], data_files / "scores.csv"
@@ -141,7 +148,8 @@ def test_users_get_none_experiment_none_score_set_from_others_private_experiment
141148

142149

143150
def test_users_get_one_experiment_one_score_set_from_own_public_experiment_set(
144-
session, data_provider, client, setup_router_db, data_files):
151+
session, data_provider, client, setup_router_db, data_files
152+
):
145153
experiment = create_experiment(client)
146154
score_set = create_seq_score_set_with_variants(
147155
client, session, data_provider, experiment["urn"], data_files / "scores.csv"
@@ -160,7 +168,8 @@ def test_users_get_one_experiment_one_score_set_from_own_public_experiment_set(
160168

161169

162170
def test_users_get_one_experiment_one_score_set_from_other_public_experiment_set(
163-
session, data_provider, client, setup_router_db, data_files):
171+
session, data_provider, client, setup_router_db, data_files
172+
):
164173
experiment = create_experiment(client)
165174
score_set = create_seq_score_set_with_variants(
166175
client, session, data_provider, experiment["urn"], data_files / "scores.csv"
@@ -170,12 +179,12 @@ def test_users_get_one_experiment_one_score_set_from_other_public_experiment_set
170179
worker_queue.assert_called_once()
171180

172181
change_ownership(session, pub_score_set["urn"], ScoreSetDbModel)
173-
change_ownership(session, pub_score_set['experiment']['urn'], ExperimentDbModel)
174-
change_ownership(session, pub_score_set['experiment']['experimentSetUrn'], ExperimentSetDbModel)
182+
change_ownership(session, pub_score_set["experiment"]["urn"], ExperimentDbModel)
183+
change_ownership(session, pub_score_set["experiment"]["experimentSetUrn"], ExperimentSetDbModel)
175184
response = client.get(f"/api/v1/experiment-sets/{pub_score_set['experiment']['experimentSetUrn']}")
176185
assert response.status_code == 200
177186
response_data = response.json()
178187
assert response_data["numExperiments"] == 1
179188
assert response_data["experiments"][0]["urn"] == pub_score_set["experiment"]["urn"]
180189
assert response_data["experiments"][0]["numScoreSets"] == 1
181-
assert pub_score_set["urn"] in response_data["experiments"][0]["scoreSetUrns"]
190+
assert pub_score_set["urn"] in response_data["experiments"][0]["scoreSetUrns"]

0 commit comments

Comments
 (0)