Eliminate the duplicate model directory -- move model into linkml_model.

We _tried_ to make model appear in linkml_model via setup.cfg, but it was infuriatingly difficult. It ended up being easier to work with the gitignore instead. All of the contents of linkml_model are included in the pypi binary distribution. model gets committed and everything else is generated.
vincentvialard · Jul 14, 2021 · b40762f · b40762f
1 parent e36c05f
commit b40762f
Show file tree

Hide file tree

Showing 11 changed files with 4 additions and 1,526 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,9 @@
 # Elements that are built using Make
 /target/
 /docs/
-/linkml_model/
+!/linkml_model/
+linkml_model/*
+!linkml_model/model
 pipx_bin/
 site/
 venv/

diff --git a/Pipfile b/Pipfile
@@ -4,15 +4,8 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-requests = "*"
-rdflib = "~=5.0"
-jsonasobj2 = "~=1.0, >=1.0.3"
 linkml-runtime = "~=1.0, >=1.0.10"
-pyldmod = "*"
-linkml = "~=1.0"
-mkdocs = "*"
 
 [dev-packages]
 
 [pipenv]
-allow_prereleases = true
diff --git a/model/docs/credits.md → linkml_model/model/docs/credits.md b/model/docs/credits.md → linkml_model/model/docs/credits.md
diff --git a/model/docs/home.md → linkml_model/model/docs/home.md b/model/docs/home.md → linkml_model/model/docs/home.md
diff --git a/model/import_map.json → linkml_model/model/import_map.json b/model/import_map.json → linkml_model/model/import_map.json
diff --git a/model/schema/annotations.yaml b/model/schema/annotations.yaml
diff --git a/model/schema/extensions.yaml b/model/schema/extensions.yaml
diff --git a/model/schema/mappings.yaml b/model/schema/mappings.yaml