0.4.x series (#67)

* 0.4.x series * bump to 0.5.0 series * change poetry setup * rolled back poetry setup * latest version * use pip install * updated poetry files from scratch * anchor poetry to 1.3.2 --------- Co-authored-by: Harshad <[email protected]> Co-authored-by: Harshad Hegde <[email protected]>
INCATools · May 10, 2023 · 8510245 · 8510245
1 parent 92319fe
commit 8510245
Show file tree

Hide file tree

Showing 11 changed files with 927 additions and 1,582 deletions.
diff --git a/.github/workflows/check-push-pull-request.yaml b/.github/workflows/check-push-pull-request.yaml
@@ -27,7 +27,7 @@ jobs:
     #          install & configure poetry
     #----------------------------------------------
     - name: Install Poetry
-      uses: snok/install-poetry@v1.3
+      run: pip install poetry==1.3.2
 
     #----------------------------------------------
     #    install your root project, if required 

diff --git a/kgcl_rdflib/apply/kgcl_2_sparql.py b/kgcl_rdflib/apply/kgcl_2_sparql.py
@@ -10,7 +10,7 @@
                                         NodeObsoletion, NodeRename,
                                         NodeShallowing, NodeUnobsoletion,
                                         PlaceUnder, PredicateChange,
-                                        RemovedNodeFromSubset, RemoveUnder)
+                                        RemoveNodeFromSubset, RemoveUnder)
 
 CURIE_PATTERN = re.compile(r"^(\w+):(\S+)$")
 SPARQL_COMMAND = str
@@ -175,7 +175,7 @@ def convert(kgcl_instance: Change) -> SPARQL_COMMAND:
     if isinstance(kgcl_instance, PredicateChange):
         return change_predicate(kgcl_instance)
 
-    if isinstance(kgcl_instance, RemovedNodeFromSubset):
+    if isinstance(kgcl_instance, RemoveNodeFromSubset):
         if is_id(kgcl_instance.about_node) and is_id(kgcl_instance.subset):
             return remove_node_from_subset(kgcl_instance)
 
@@ -272,7 +272,7 @@ def node_move(kgcl_instance: NodeMove) -> SPARQL_COMMAND:
     return update__query
 
 
-def remove_node_from_subset(kgcl_instance: RemovedNodeFromSubset) -> SPARQL_COMMAND:
+def remove_node_from_subset(kgcl_instance: RemoveNodeFromSubset) -> SPARQL_COMMAND:
     """Return SPARQL query to remove node from subset."""
     about = kgcl_instance.about_node
     subset = kgcl_instance.subset

diff --git a/kgcl_rdflib/render_kgcl.py b/kgcl_rdflib/render_kgcl.py
@@ -4,7 +4,7 @@
                                     NodeDeletion, NodeMove, NodeObsoletion,
                                     NodeRename, NodeShallowing,
                                     NodeUnobsoletion, PredicateChange,
-                                    RemovedNodeFromSubset)
+                                    RemoveNodeFromSubset)
 
 
 def render(kgcl_instance):
@@ -220,10 +220,10 @@ def render(kgcl_instance):
     #            + "Subset=" + kgclInstance.in_subset + ", " \
     #            + "About Node" + kgclInstance.about_node + ")"
 
-    if type(kgcl_instance) is RemovedNodeFromSubset:
+    if type(kgcl_instance) is RemoveNodeFromSubset:
         render = (
             render
-            + "RemovedNodeFromSubset("
+            + "RemoveNodeFromSubset("
             + "ID="
             + kgcl_instance.id
             + ", "

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,30 +1,24 @@
 [tool.poetry]
 name = "kgcl-rdflib"
 version = "0.2.0"
-description = "Schema fro the KGCL project."
+description = "Schema for the KGCL project."
 authors = [
     "Christian Kindermann <[email protected]>",
     "Chris Mungall <[email protected]>",
     "Harshad Hegde <[email protected]>"
     ]
 license = "MIT"
 readme = "README.md"
-
+packages = [{include = "kgcl_rdflib"}]
 
 [tool.poetry.dependencies]
 python = "^3.8"
-linkml-runtime = "^1.1.24"
-lark = "^1.1.2"
-kgcl-schema = "^0.3.0"
-
-[tool.poetry.dev-dependencies]
-linkml = "^1.2.15"
-mkdocs-material = "^8.2.8"
-pytest = "^7.1.2"
+linkml-runtime = ">=1.1.24"
+kgcl-schema = ">=0.5.0"
 
-[build-system]
-requires = ["poetry-core>=1.0.0"]
-build-backend = "poetry.core.masonry.api"
+[tool.poetry.group.dev.dependencies]
+mkdocs-material = "^9.1.11"
+pytest = "^7.3.1"
 
 [tool.poetry.scripts]
 kgcl-diff = "kgcl.kgcl_diff:cli"
@@ -33,3 +27,7 @@ kgcl-parse = "kgcl.grammar.parser:cli"
 
 [tool.poetry.extras]
 docs = ["linkml", "mkdocs-material"]
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"
diff --git a/tests/test_grammar/test_parse.py b/tests/test_grammar/test_parse.py
diff --git a/tests/test_model/__init__.py b/tests/test_model/__init__.py
diff --git a/tests/test_model/test_change_model.py b/tests/test_model/test_change_model.py
diff --git a/tests/test_model/test_conversion.py b/tests/test_model/test_conversion.py
diff --git a/tests/test_model/test_introspect.py b/tests/test_model/test_introspect.py
diff --git a/tests/test_model/test_ontology_model.py b/tests/test_model/test_ontology_model.py