Merge pull request #628 from emmo-repo/flb/issue-627-emmocheck

Check prefLabels in imported ontologies only if asked for.
emmo-repo · Jun 19, 2023 · 3d5b2f0 · 3d5b2f0
2 parents e6d6e08 + 116f7ad
commit 3d5b2f0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/emmopy/emmocheck.py b/emmopy/emmocheck.py
@@ -89,12 +89,11 @@ def test_number_of_labels(self):
         exceptions.update(
             self.get_config("test_number_of_labels.exceptions", ())
         )
-
         if (
             "prefLabel"
             in self.onto.world._props  # pylint: disable=protected-access
         ):
-            for entity in self.onto.get_entities():
+            for entity in self.onto.classes(self.check_imported):
                 if repr(entity) not in exceptions:
                     with self.subTest(
                         entity=entity,

diff --git a/ontopy/manchester.py b/ontopy/manchester.py
@@ -45,11 +45,11 @@ def manchester_expression():
     literal = (
         typedLiteral | stringLanguageLiteral | stringLiteral | numberLiteral
     )
-    logOp = pp.oneOf(["and", "or"], asKeyword=True)
+    logOp = pp.one_of(["and", "or"], asKeyword=True)
     expr = pp.Forward()
     restriction = pp.Forward()
     primary = pp.Keyword("not")[...] + (
-        restriction | ident("cls") | pp.nestedExpr("(", ")", expr)
+        restriction | ident("cls") | pp.nested_expr("(", ")", expr)
     )
     objPropExpr = (
         pp.Literal("inverse")