Merge branch 'develop' into guideline36-section4

NREL · Sep 18, 2024 · f0647d5 · f0647d5
2 parents c22fedc + 39087f9
commit f0647d5
Show file tree

Hide file tree

Showing 14 changed files with 82,755 additions and 25,802 deletions.
diff --git a/buildingmotif/libraries/brick/Brick.ttl b/buildingmotif/libraries/brick/Brick.ttl
diff --git a/libraries/ZonePAC/shapes.ttl b/libraries/ZonePAC/shapes.ttl
@@ -20,7 +20,7 @@
 @prefix : <urn:zonepac-app/> .
 
 <urn:zonepac-app> a owl:Ontology ;
-    owl:imports <https://brickschema.org/schema/1.3/Brick> ;
+    owl:imports <https://brickschema.org/schema/1.4/Brick> ;
 .
 
 :zonepac-zone a sh:NodeShape ;

diff --git a/libraries/brick/Brick.ttl b/libraries/brick/Brick.ttl
diff --git a/libraries/sites/medium-office/contraints.ttl b/libraries/sites/medium-office/contraints.ttl
@@ -9,7 +9,7 @@
 @prefix bldg: <urn:medium-office/> .
 
 : a owl:Ontology ;
-    owl:imports <https://brickschema.org/schema/1.3/Brick> ;
+    owl:imports <https://brickschema.org/schema/1.4/Brick> ;
     owl:imports <https://nrel.gov/BuildingMOTIF/constraints> ;
     owl:imports <urn:ashrae/g36> ;
 .

diff --git a/tests/unit/dataclasses/test_model.py b/tests/unit/dataclasses/test_model.py
@@ -58,7 +58,7 @@ def test_validate_model_manifest(clean_building_motif, shacl_engine):
     m = Model.create(name="https://example.com", description="a very good model")
     m.graph.add((URIRef("https://example.com/vav1"), A, BRICK.VAV))
 
-    Library.load(ontology_graph="tests/unit/fixtures/Brick1.3rc1-equip-only.ttl")
+    Library.load(ontology_graph="tests/unit/fixtures/Brick.ttl")
     lib = Library.load(ontology_graph="tests/unit/fixtures/shapes/shape1.ttl")
     assert lib is not None
 
@@ -134,7 +134,7 @@ def test_validate_model_manifest_with_imports(clean_building_motif, shacl_engine
 def test_validate_model_explicit_shapes(clean_building_motif, shacl_engine):
     clean_building_motif.shacl_engine = shacl_engine
     # load library
-    Library.load(ontology_graph="tests/unit/fixtures/Brick1.3rc1-equip-only.ttl")
+    Library.load(ontology_graph="tests/unit/fixtures/Brick.ttl")
     lib = Library.load(ontology_graph="tests/unit/fixtures/shapes/shape1.ttl")
     assert lib is not None
 

diff --git a/tests/unit/dataclasses/test_shape_collection.py b/tests/unit/dataclasses/test_shape_collection.py
@@ -101,7 +101,7 @@ def test_get_shapes_of_domain(clean_building_motif):
 
 
 def test_shape_collection_resolve_imports(clean_building_motif):
-    Library.load(ontology_graph="tests/unit/fixtures/Brick1.3rc1-equip-only.ttl")
+    Library.load(ontology_graph="tests/unit/fixtures/Brick.ttl")
     Library.load(ontology_graph="constraints/constraints.ttl")
     lib = Library.load(ontology_graph="tests/unit/fixtures/shapes/import_test.ttl")
     sc = lib.get_shape_collection()

diff --git a/tests/unit/dataclasses/test_template_dc.py b/tests/unit/dataclasses/test_template_dc.py
@@ -187,15 +187,15 @@ def test_remove_depedancy_does_not_exist(clean_building_motif):
 
 
 def test_get_library_dependencies(clean_building_motif):
-    Library.load(ontology_graph="tests/unit/fixtures/Brick1.3rc1-equip-only.ttl")
+    Library.load(ontology_graph="tests/unit/fixtures/Brick.ttl")
     lib = Library.load(directory="tests/unit/fixtures/sample-lib-1")
     sf_templ = lib.get_template_by_name("fan")
     libs = sf_templ.library_dependencies()
     assert len(libs) == 2
     assert all(map(lambda x: isinstance(x, Library), libs))
     assert {str(lib.name) for lib in libs} == {
         "sample-lib-1",
-        "https://brickschema.org/schema/1.3/Brick",
+        "https://brickschema.org/schema/1.4/Brick",
     }