Merge branch 'master' into pcl_migration

# Conflicts:
#	src/dendrograms/taxonomy_details.yaml
#	src/markers/CS202002013_markers.tsv

Author: hkir-dev

bdso.yaml

@@ -1,14 +1,14 @@
-
-id: bdso
-title: Brain Data Standards Cell Ontology
-github_org: obophenotype
-repo: bdso
-export_formats:
-  - owl
-  - obo
-  - json
-import_group:
-  products:
-    - id: ro
-    - id: bfo
-    - id: pato
+#
+#id: bdso
+#title: Brain Data Standards Cell Ontology
+#github_org: obophenotype
+#repo: bdso
+#export_formats:
+#  - owl
+#  - obo
+#  - json
+#import_group:
+#  products:
+#    - id: ro
+#    - id: bfo
+#    - id: pato

src/ontology/bdso.Makefile

@@ -41,7 +41,7 @@ $(PATTERNDIR)/data/default/%.txt: $(PATTERNDIR)/dosdp-patterns/%.yaml $(PATTERND
 	if [ $(PAT) = true ]; then $(DOSDPT) terms --prefixes=template_prefixes.yaml --infile=$(word 2, $^) --template=$< --obo-prefixes=true --outfile=$@; fi
 
 # adding an extra query step to inject version info to imported entities
-imports/%_import.owl: mirror/%.owl imports/%_terms_combined.txt
+imports/%_import.owl: mirror/merged.owl imports/%_terms_combined.txt
 	if [ $(IMP) = true ]; then $(ROBOT) query  -i $< --update ../sparql/inject-version-info.ru --update ../sparql/preprocess-module.ru \
 		extract -T imports/$*_terms_combined.txt --force true --copy-ontology-annotations true --individuals exclude --method BOT \
 		query --update ../sparql/inject-subset-declaration.ru --update ../sparql/postprocess-module.ru \