Skip to content

Commit

Permalink
Merge pull request #526 from monarch-initiative/remove-monarch-py-req…
Browse files Browse the repository at this point in the history
…uirement

Remove monarch-py as a dependency to avoid incompatible dependencies between sssom-py & kgx, get the schema with curl commands instead
  • Loading branch information
kevinschaper authored Sep 27, 2023
2 parents 0f47ae2 + a510497 commit 145373f
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 119 deletions.
122 changes: 9 additions & 113 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,16 @@ packages = [
python = ">=3.10,<3.12"
kghub-downloader = "^0.3.2"
koza = "^0.3.0"
cat-merge = "0.1.21"
cat-merge = ">=0.2.0"
closurizer = "0.3.0"
monarch-py = "^0.15.6"
kgx = "^2.1.0"
kgx = ">=2.1"
multi-indexer = "0.0.5"
botocore = "^1.31"
biolink-model = "3.5.0"
linkml = "^1.5.7"
#linkml-solr = "^0.1.3"
linkml-solr = {git = "https://github.com/linkml/linkml-solr.git", branch = "top_class"}
importlib-metadata = "^4.6.1"
importlib-metadata = ">=4.6.1"
sh = "^1.14.3"
typer = "^0.7"
typer-cli = "^0.0.13"
Expand Down
6 changes: 4 additions & 2 deletions scripts/load_solr.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@ if test -f "output/monarch-kg-denormalized-edges.tsv.gz"; then
gunzip --force output/monarch-kg-denormalized-edges.tsv.gz
fi

echo "Extracting the schema from monarch-py"
poetry run monarch schema > model.yaml
echo "Download the schema from monarch-py"
# This replaces poetry run monarch schema > model.yaml
curl -O https://raw.githubusercontent.com/monarch-initiative/monarch-app/v0.15.8/backend/src/monarch_py/datamodels/model.yaml
curl -O https://raw.githubusercontent.com/monarch-initiative/monarch-app/v0.15.8/backend/src/monarch_py/datamodels/similarity.yaml

echo "Starting the server"
poetry run lsolr start-server
Expand Down

0 comments on commit 145373f

Please sign in to comment.