Merge pull request #16 from linkml/pydantic2

migrate to pydantic2 New notebook for metamodel mapping adding mapping between collection types Fixed doc action
linkml · Jan 6, 2024 · 0b96a96 · 0b96a96
2 parents 265f3ed + 3b084b0
commit 0b96a96
Show file tree

Hide file tree

Showing 15 changed files with 7,003 additions and 96 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 .idea
 project/
-docs/
+./docs/
 tmp/
 site/
 __pycache__

diff --git a/Makefile b/Makefile
@@ -46,7 +46,7 @@ deploy: all mkd-gh-deploy
 
 # TODO: make this default
 src/linkml_transformer/datamodel/transformer_model.py: src/linkml_transformer/datamodel/transformer_model.yaml
-	$(RUN) gen-pydantic $< > $@.tmp && mv $@.tmp $@
+	$(RUN) gen-pydantic --pydantic-version 2 $< > $@.tmp && mv $@.tmp $@
 
 # generates all project files
 # TODO: combine pydantic into this step
@@ -95,6 +95,7 @@ $(DOCDIR):
 	mkdir -p $@
 
 gendoc: $(DOCDIR)
+	cp -pr $(SRC)/docs/* $(DOCDIR) ; \
 	$(RUN) gen-doc -d $(DOCDIR) $(SOURCE_SCHEMA_PATH)
 
 testdoc: gendoc serve