diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b71529c98..a1463e409 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,6 +3,10 @@ name: continuous integration on: push +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: styling: diff --git a/libraries/ashrae/223p/ontology/223p.ttl b/libraries/ashrae/223p/ontology/223p.ttl index b67a5ec74..0cf55aca7 100644 --- a/libraries/ashrae/223p/ontology/223p.ttl +++ b/libraries/ashrae/223p/ontology/223p.ttl @@ -2409,14 +2409,6 @@ g36:FanWithVFDAnnotation a sh:NodeShape ; sh:subject sh:this ] ; sh:targetClass s223:Fan . -g36:FilterAnnotation a sh:NodeShape ; - sh:rule [ a sh:TripleRule ; - sh:condition g36:Filter ; - sh:object g36:Filter ; - sh:predicate rdf:type ; - sh:subject sh:this ] ; - sh:targetClass s223:AirFilter . - g36:HotWaterCoilAnnotation a sh:NodeShape ; sh:rule [ a sh:TripleRule ; rdfs:comment "If an instance of s223:HeatingCoil matches the constraints defined by g36:HotWaterCoil, it will be declared as an instance of that class." ; diff --git a/tests/integration/test_database_persistence.py b/tests/integration/test_database_persistence.py index d71d8e69d..b6802a156 100644 --- a/tests/integration/test_database_persistence.py +++ b/tests/integration/test_database_persistence.py @@ -8,9 +8,10 @@ EXAMPLE_TRIPLE = (URIRef("http://example.org/alex"), RDF.type, FOAF.Person) -def test_database_persistence(tmpdir): +def test_database_persistence(tmp_path): # create bm - db_path = f"sqlite:///{tmpdir}/db.db" + path = tmp_path / "db.db" + db_path = f"sqlite:///{path}" bm = BuildingMOTIF(db_path) bm.setup_tables()