Skip to content

Commit 5d9ebff

Browse files
remove md5sum, refactor name to bedfile_name and bedset_name
1 parent 207c795 commit 5d9ebff

File tree

5 files changed

+10
-13
lines changed

5 files changed

+10
-13
lines changed

bbconf/bbconf.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@
4141
)
4242
from bbconf.exceptions import MissingConfigDataError, BedBaseConfError
4343
from bbconf.helpers import raise_missing_key, get_bedbase_cfg
44-
os.environ["TF_CPP_MIN_LOG_LEVEL"] = "3" # to suppress verbose warnings tensorflow
44+
45+
os.environ["TF_CPP_MIN_LOG_LEVEL"] = "3" # to suppress verbose warnings tensorflow
4546
from geniml.text2bednn import text2bednn
4647
from geniml.search import QdrantBackend
4748
from sentence_transformers import SentenceTransformer

bbconf/schemas/bedfiles_schema.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
pipeline_name: bedfile
22
samples:
3-
name:
3+
bedfile_name:
44
type: string
55
description: BED file name
6-
md5sum:
7-
type: string
8-
description: BED file checksum
96
genome:
107
type: object
118
description: genome assembly of the BED files

bbconf/schemas/bedsets_schema.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
pipeline_name: bedsets
22
samples:
3-
name:
3+
bedset_name:
44
type: string
55
description: BED set name
6-
md5sum:
7-
type: string
8-
description: BED set checksum
96
genome:
107
type: object
118
description: genome assembly of the BED sets

tests/conftest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
@pytest.fixture
88
def test_data_bed():
99
s = "test_string"
10-
return {"name": s, "md5sum": s, "bedfile": {"path": s, "title": s}, "regions_no": 1}
10+
return {"bedfile_name": s, "bedfile": {"path": s, "title": s}, "regions_no": 1}
1111

1212

1313
@pytest.fixture
1414
def test_data_bedset():
1515
s = "test_string"
16-
return {"name": s, "md5sum": s, "bedset_tar_archive_path": {"path": s, "title": s}}
16+
return {"bedset_name": s, "bedset_tar_archive_path": {"path": s, "title": s}}
1717

1818

1919
@pytest.fixture

tests/test_bbconf.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,9 @@ def test_nonunique_digest_insert_error(
6565
bbc.bed.report(record_identifier="bed1", values=test_data_bed)
6666
assert not bbc.bed.report(record_identifier="bed1", values=test_data_bed)
6767
bbc.bedset.report(record_identifier="bedset1", values=test_data_bedset)
68-
assert not bbc.bedset.report(record_identifier="bedset1", values=test_data_bedset)
68+
assert not bbc.bedset.report(
69+
record_identifier="bedset1", values=test_data_bedset
70+
)
6971

7072
def test_reporting_relationships(self, cfg_pth, test_data_bed, test_data_bedset):
7173
with ContextManagerDBTesting(DB_URL):
@@ -139,4 +141,4 @@ def test_config_variables_are_set(self, cfg_pth, test_data_bed, test_data_bedset
139141
print(bbc.config["qdrant"]["host"])
140142
assert bbc.config["qdrant"]["host"] == "test_localhost"
141143
assert bbc.config["path"]["region2vec"] is not None
142-
assert bbc.config["database"]["host"] == "localhost"
144+
assert bbc.config["database"]["host"] in ["localhost", "127.0.0.1"]

0 commit comments

Comments
 (0)