Update makes, shell scripts, etc.

Also updated Pipfile and requirements.txt to remove a whole lot of unneeded dependencies

Makefile

@@ -14,7 +14,7 @@ SCHEMA_NAMES = $(patsubst $(SCHEMA_DIR)/%.yaml, %, $(SOURCE_FILES))
 SCHEMA_NAME = meta
 SCHEMA_SRC = $(SCHEMA_DIR)/$(SCHEMA_NAME).yaml
 PKG_TGTS = graphql json jsonld jsonschema owl rdf shex
-TGTS = docs model python $(PKG_TGTS)
+TGTS = docs python $(PKG_TGTS)
 
 # Run a linkml package
 RUN =
@@ -61,7 +61,6 @@ clean:
 # ---------------------------------------
 squeaky-clean: clean $(patsubst %,squeaky-clean-%,$(PKG_TGTS))
 	find docs/*  ! -name 'README.*' -exec rm -rf {} +
-	find $(PKG_DIR)/model/schema  ! -name 'README.*' -type f -exec rm -f {} +
 	find $(PKG_DIR) -name "*.py" ! -name "__init__.py" ! -name "linkml_files.py" -exec rm -f {} +
 	rm -rf .venv
 
@@ -105,11 +104,9 @@ target/docs/index.md: $(SCHEMA_DIR)/$(SCHEMA_NAME).yaml tdir-docs install
 # ---------------------------------------
 # YAML source
 # ---------------------------------------
-gen-model: $(patsubst %, $(PKG_DIR)/model/schema/%.yaml, $(SCHEMA_NAMES))
-
-$(PKG_DIR)/model/schema/%.yaml: model/schema/%.yaml
-	cp $< $@
-.PHONY: gen-linkml_model
+# YAML source is no longewr copied to the output directory.  Instead, it is placed there via setup.cfg
+gen-model:
+.PHONY: gen-model
 
 # ---------------------------------------
 # python source

Pipfile

@@ -7,5 +7,7 @@ name = "pypi"
 linkml-runtime = "~=1.0, >=1.0.10"
 
 [dev-packages]
+linkml = "~=1.0, >=1.0.1"
+mkdocs = "*"
 
 [pipenv]

checkout_outputs.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
 # checkout (update) all of the outputs to revert to what is on github
-. ./targets.sh
-git checkout $TGTS
+
+git checkout docs
+ls linkml_model | grep -v model | xargs git checkout

requirements.txt

@@ -10,10 +10,4 @@
 # `Pipfile.lock` and then regenerate `requirements*.txt`.
 ################################################################################
 
-jsonasobj2~=1.0, >=1.0.3
 linkml-runtime~=1.0, >=1.0.10
-linkml~=1.0
-mkdocs
-pyldmod
-rdflib~=5.0
-requests

show_test_changes.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
 # Make all of the test output changes visible to git
-. ./targets.sh
-git ls-files -z $TGTS | tr '\n' ' ' | xargs git update-index --no-assume-unchanged
+git ls-files -z docs linkml_model | tr '\n' ' ' | xargs git update-index --no-assume-unchanged
 

targets.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 # Generate a variable that establishes all of the target directories
-export TGTS="docs graphql json jsonld jsonschema owl linkml_model rdf shex"
+export TGTS="docs graphql json jsonld jsonschema owl rdf shex"