Skip to content

Commit 8aafd74

Browse files
committed
Addressed Eli's comments
1 parent ee3ca75 commit 8aafd74

3 files changed

Lines changed: 8 additions & 20 deletions

File tree

tests/integration/profiles/five-safes-crate/test_valid_5src.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,11 @@
2626
logger.setLevel(logging.DEBUG)
2727

2828
# Dynamically fetch the SKIP_WEB_RESOURCE_AVAILABILITY_IDENTIFIER
29-
# required as disable_inherited_profiles_reporting does not disable Python checks from
30-
# inherited profiles (https://github.com/crs4/rocrate-validator/issues/135)
3129
rocrate_profile = services.get_profile("ro-crate-1.2")
3230
if not rocrate_profile:
3331
raise RuntimeError("Unable to load the RO-Crate 1.2 profile")
34-
check_local_data_entity_existence = rocrate_profile.get_requirement_check(
35-
"Data Entity: REQUIRED resource availability"
36-
)
37-
assert check_local_data_entity_existence, (
38-
"Unable to find the requirement 'Data Entity: REQUIRED resource availability'"
39-
)
32+
check_local_data_entity_existence = rocrate_profile.get_requirement_check("Data Entity: REQUIRED resource availability")
33+
assert check_local_data_entity_existence, "Unable to find the requirement 'Data Entity: REQUIRED resource availability'"
4034
SKIP_LOCAL_DATA_ENTITY_EXISTENCE_CHECK_IDENTIFIER = check_local_data_entity_existence.identifier
4135
check_local_data_entity_existence = rocrate_profile.get_requirement_check(
4236
"Web-based Data Entity: REQUIRED resource availability"

tests/integration/profiles/test_metadata_only.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,9 @@ def test_valid_ro_crates_from_folder(valid_roc_path):
6464
[],
6565
profile_identifier=(
6666
# ro-crate-1.1 can't be used for Five Safes crates as they conform to 1.2
67-
"five-safes-crate"
68-
if "five-safes-crate" in valid_roc_path.name
69-
else DEFAULT_PROFILE_IDENTIFIER
67+
"five-safes-crate" if "five-safes-crate" in valid_roc_path.name else DEFAULT_PROFILE_IDENTIFIER
7068
),
71-
metadata_only=True
69+
metadata_only=True,
7270
)
7371

7472

@@ -90,10 +88,8 @@ def test_valid_ro_crates_from_metadata_dict(valid_roc_path):
9088
[],
9189
profile_identifier=(
9290
# ro-crate-1.1 can't be used for Five Safes crates as they conform to 1.2
93-
"five-safes-crate"
94-
if "five-safes-crate" in valid_roc_path.name
95-
else DEFAULT_PROFILE_IDENTIFIER
91+
"five-safes-crate" if "five-safes-crate" in valid_roc_path.name else DEFAULT_PROFILE_IDENTIFIER
9692
),
9793
metadata_dict=metadata_dict,
98-
metadata_only=True
94+
metadata_only=True,
9995
)

tests/shared.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
PREFIX schema: <http://schema.org/>
4141
PREFIX shp: <https://w3id.org/shp#>
4242
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
43-
PREFIX rocrate: <https://github.com/crs4/rocrate-validator/profiles/ro-crate-1.2/>
4443
PREFIX dct: <http://purl.org/dc/terms/>
4544
"""
4645

@@ -95,12 +94,11 @@ def replace_uri_in_graph(graph, old_uri_str, new_uri_str):
9594

9695
return g
9796

97+
9898
def _uses_https_schema(graph: rdflib.Graph) -> bool:
9999
for s, p, o in graph.triples((None, None, None)):
100100
for term in (s, p, o):
101-
if isinstance(term, rdflib.URIRef) and str(term).startswith(
102-
"https://schema.org/"
103-
):
101+
if isinstance(term, rdflib.URIRef) and str(term).startswith("https://schema.org/"):
104102
return True
105103
return False
106104

0 commit comments

Comments
 (0)