Merge pull request #1 from linkml/poetry

Convert from Pipenv to Poetry & update linkml_model import location
linkml · Mar 11, 2022 · 5fbc5f4 · 5fbc5f4
2 parents afd5b06 + 80d7305
commit 5fbc5f4
Show file tree

Hide file tree

Showing 9 changed files with 1,955 additions and 73 deletions.
diff --git a/Pipfile b/Pipfile
diff --git a/linkml_solr/cli.py b/linkml_solr/cli.py
@@ -3,7 +3,7 @@
 import logging
 import subprocess
 from linkml.generators.yamlgen import YAMLGenerator
-from linkml_model.meta import SchemaDefinition, SlotDefinitionName
+from linkml_runtime.linkml_model.meta import SchemaDefinition, SlotDefinitionName
 from linkml_runtime.loaders import yaml_loader
 from linkml_solr import SolrQueryEngine, SolrEndpoint, DEFAULT_CORE, DEFAULT_SOLR_URL
 from linkml_solr.utils.solr_bulkload import bulkload_file
@@ -164,4 +164,4 @@ def create_schema(schema, url, core):
 
 
 if __name__ == '__main__':
-    main()
+    main()
diff --git a/linkml_solr/query.py b/linkml_solr/query.py
@@ -8,7 +8,7 @@
 
 from linkml_runtime.dumpers import json_dumper
 from linkml_runtime.utils.formatutils import underscore
-from linkml_model.meta import SchemaDefinition, ClassDefinition, YAMLRoot, ElementName, SlotDefinition, SlotDefinitionName
+from linkml_runtime.linkml_model.meta import SchemaDefinition, ClassDefinition, YAMLRoot, ElementName, SlotDefinition, SlotDefinitionName
 
 from linkml_solr.solrmodel import SolrEndpoint, SolrQuery, SolrQueryResult, RawSolrResult, FIELD
 from linkml_solr.solrschema import Transaction

diff --git a/linkml_solr/utils/solr_bulkload.py b/linkml_solr/utils/solr_bulkload.py
@@ -2,7 +2,7 @@
 import logging
 import subprocess
 from linkml.generators.yamlgen import YAMLGenerator
-from linkml_model.meta import SchemaDefinition, SlotDefinitionName
+from linkml_runtime.linkml_model.meta import SchemaDefinition, SlotDefinitionName
 from linkml_runtime.loaders import yaml_loader
 from linkml_solr import SolrQueryEngine, SolrEndpoint