make all/test both ok #123

Makefile

@@ -312,6 +312,11 @@ docserve: gen-docs
 generate-model: install install-dev
 	CDM_GOOGLE_SHEET_ID=$(CDM_GOOGLE_SHEET_ID) $(RUN) python vendor/sheet2linkml/sheet2linkml.py --output model/schema/crdch_model.yaml
 
+# --logging-config ~/path/to/logging.ini
+model/schema/crdch_model.yaml: install install-dev
+	CDM_GOOGLE_SHEET_ID=$(CDM_GOOGLE_SHEET_ID) $(RUN) sheet2linkml --output $@
+
+
 # MAM 20210806 not sure how this fits into the linkml model template's doc building/publsihing approach
 # Deploy changes to the `dev` version on the gh-pages branch.
 # Note that this is not dependent on stage-docs, since you

Pipfile

@@ -15,6 +15,15 @@ linkml-runtime = {editable = true, git = "https://github.com/linkml/linkml-runti
 pyparsing = "<=2.4.7"
 rdflib-pyld-compat = "*" # resinstating after removal by migration to linkml model template
 
+# from dev-packages
+mike = "*"
+mkdocs-material = "*"
+
+# 1.0.1 is avaialble but won't install on my linux workstation via pip or pipenv
+sheet2linkml = "==1.0.0"
+python-dotenv = "*"
+
+
 [dev-packages]
 pyyaml = "*"            # For reading and writing YAML files.
 
@@ -24,17 +33,18 @@ tox = "*"
 typing_extensions = "*" # This is a tox prereq for Python 3.7, but not installed by Pipenv.
 twine = "*" # should this go in make-venv/Pipfile ?
 
-# Packages needed by sheet2linkml.
-black = "==v21.5b1"     # Used for code linting.
-requests = "*"          # For making HTTP requests.
-pygsheets = "*"         # For accessing Google Sheets.
-python-dotenv = "*"     # For reading .env files.
+## Packages needed by sheet2linkml.
+# black = "==v21.5b1"     # Used for code linting.
+# requests = "*"          # For making HTTP requests.
+# pygsheets = "*"         # For accessing Google Sheets.
+# python-dotenv = "*"     # For reading .env files.
 
-# Packages needed for building and publishing documentation.
-mike = "*"
-mkdocs-material = "*"
+## Packages needed for building and publishing documentation.
+# mike = "*"
+# mkdocs-material = "*"
 
 [pipenv]
 allow_prereleases = true # added by migration to linkml model template
 
 [requires]
+python_version = "3.9"