fixing conflicts

.github/workflows/pr-verify-pull-request.yaml

@@ -40,9 +40,6 @@ jobs:
           make test
           poetry run codespell
           poetry run yamllint -c .yamllint-config biolink-model.yaml
-          poetry run yamllint -c .yamllint-config infores_catalog.yaml
-          make validate_infores
-
 
 
 

ChangeLog

@@ -1,5 +1,11 @@
 CHANGES
 =======
+4.2.0-rc.2
+----
+## What's Changed
+* infores catalog has now moved to its own repository.
+
+
 4.2.0-rc.1
 ----
 

Makefile

@@ -86,20 +86,14 @@ update-linkml:
 	poetry add -D linkml@latest
 
 all: site
-site: gen-project gendoc infores id-prefixes
+site: gen-project gendoc id-prefixes
 %.yaml: gen-project
 deploy: all mkd-gh-deploy
 
 # In future this will be done by conversion
 gen-examples:
 	cp src/data/examples/* $(EXAMPLEDIR)
 
-infores:
-	$(RUN) gen-python information-resource.yaml > information_resource.py
-
-validate_infores:
-	$(RUN) python src/biolink_model/scripts/verify_infores.py
-
 id-prefixes:
 	$(RUN) gen-python class_prefixes.yaml > src/biolink_model/scripts/classprefixes.py
 	cd src/biolink_model/scripts/ && $(RUN) python id_prefixes.py
@@ -133,15 +127,13 @@ gen-project: $(PYMODEL)
 	$(RUN) gen-pydantic --pydantic-version 2 src/biolink_model/schema/biolink_model.yaml > $(PYMODEL)/pydanticmodel_v2.py
 	$(RUN) gen-owl --mergeimports --no-metaclasses --no-type-objects --add-root-classes --mixins-as-expressions src/biolink_model/schema/biolink_model.yaml > $(DEST)/owl/biolink_model.owl.ttl
 	cp biolink-model.yaml src/biolink_model/schema/biolink_model.yaml
-	$(MAKE) id-prefixes infores
+	$(MAKE) id-prefixes
 
 tests:
 	cp biolink-model.yaml src/biolink_model/schema/biolink_model.yaml
 	$(RUN) python -m unittest discover -p 'test_*.py'
 	$(RUN) codespell
 	$(RUN) yamllint -c .yamllint-config biolink-model.yaml
-	$(RUN) yamllint -c .yamllint-config infores_catalog.yaml
-	$(RUN) python scripts/verify_infores.py
 
 test: test-schema test-python test-examples lint spell
 
@@ -209,8 +201,6 @@ gendoc: $(DOCDIR)
 	cp $(DEST)/shex/biolink_model.shex $(DOCDIR)/biolink-modeln.shex ; \
 	cp $(DEST)/shacl/biolink_model.shacl.ttl $(DOCDIR)/biolink-model.shacl.ttl ; \
 	cp $(DEST)/prefixmap/* $(DOCDIR) ; \
-	cp infores_catalog.yaml $(DOCDIR) ; \
-	cp information-resource.yaml $(DOCDIR) ; \
 	cp semmed-exclude-list.yaml $(DOCDIR) ; \
 	cp semmed-exclude-list-model.yaml $(DOCDIR) ; \
 	cp predicate_mapping.yaml $(DOCDIR) ; \