From 3246a6ba2ce5d6c2f1f8580d55b9a5e59c1c10e8 Mon Sep 17 00:00:00 2001 From: Harshad Hegde Date: Fri, 27 Oct 2023 15:14:20 -0500 Subject: [PATCH] refactor ~bacdive~ => microbe --- .cruft.json | 4 ++-- .github/workflows/deploy-docs.yml | 4 ++-- .github/workflows/qc.yml | 2 +- .gitignore | 2 +- README.md | 6 +++--- docs/conf.py | 2 +- docs/modules.rst | 2 +- {kg_bacdive => kg_microbe}/__init__.py | 2 +- {kg_bacdive => kg_microbe}/download.py | 0 {kg_bacdive => kg_microbe}/merge_utils/__init__.py | 0 {kg_bacdive => kg_microbe}/merge_utils/merge_kg.py | 0 {kg_bacdive => kg_microbe}/query.py | 0 {kg_bacdive => kg_microbe}/run.py | 10 +++++----- {kg_bacdive => kg_microbe}/transform.py | 10 +++++----- .../transform_utils/__init__.py | 0 .../transform_utils/bacdive/__init__.py | 0 .../transform_utils/bacdive/bacdive.py | 6 +++--- .../transform_utils/bacdive/tmp/.keep | 0 .../transform_utils/bacdive/tmp/bacdive.tsv | 0 .../transform_utils/bacdive/tmp/yaml/.keep | 0 .../transform_utils/constants.py | 0 .../transform_utils/example_transform/__init__.py | 0 .../example_transform/example_transform.py | 2 +- .../transform_utils/mediadive/__init__.py | 0 .../transform_utils/mediadive/mediadive.py | 6 +++--- .../transform_utils/mediadive/tmp/.keep | 0 .../transform_utils/mediadive/tmp/mediadive.tsv | 0 .../mediadive/tmp/medium_yaml/.keep | 0 .../transform_utils/ontology/__init__.py | 0 .../transform_utils/ontology/ontology_transform.py | 4 ++-- .../transform_utils/traits/__init__.py | 0 .../transform_utils/traits/metabolism_map.yaml | 0 .../transform_utils/traits/traits.py | 8 ++++---- .../transform_utils/transform.py | 2 +- .../transform_utils/translation_table.yaml | 0 {kg_bacdive => kg_microbe}/utils/__init__.py | 0 {kg_bacdive => kg_microbe}/utils/ner_utils.py | 2 +- {kg_bacdive => kg_microbe}/utils/pandas_utils.py | 2 +- {kg_bacdive => kg_microbe}/utils/robot_utils.py | 2 +- merge.yaml | 6 +++--- merged_graph_stats.yaml | 2 +- notebook/kg_bacdive.ipynb | 2 +- pyproject.toml | 6 +++--- templates/README.build | 8 ++++---- templates/README.toplevel | 2 +- tests/__init__.py | 2 +- tests/demo_test.py | 2 +- tox.ini | 14 +++++++------- 48 files changed, 61 insertions(+), 61 deletions(-) rename {kg_bacdive => kg_microbe}/__init__.py (92%) rename {kg_bacdive => kg_microbe}/download.py (100%) rename {kg_bacdive => kg_microbe}/merge_utils/__init__.py (100%) rename {kg_bacdive => kg_microbe}/merge_utils/merge_kg.py (100%) rename {kg_bacdive => kg_microbe}/query.py (100%) rename {kg_bacdive => kg_microbe}/run.py (95%) rename {kg_bacdive => kg_microbe}/transform.py (84%) rename {kg_bacdive => kg_microbe}/transform_utils/__init__.py (100%) rename {kg_bacdive => kg_microbe}/transform_utils/bacdive/__init__.py (100%) rename {kg_bacdive => kg_microbe}/transform_utils/bacdive/bacdive.py (98%) rename {kg_bacdive => kg_microbe}/transform_utils/bacdive/tmp/.keep (100%) rename {kg_bacdive => kg_microbe}/transform_utils/bacdive/tmp/bacdive.tsv (100%) rename {kg_bacdive => kg_microbe}/transform_utils/bacdive/tmp/yaml/.keep (100%) rename {kg_bacdive => kg_microbe}/transform_utils/constants.py (100%) rename {kg_bacdive => kg_microbe}/transform_utils/example_transform/__init__.py (100%) rename {kg_bacdive => kg_microbe}/transform_utils/example_transform/example_transform.py (97%) rename {kg_bacdive => kg_microbe}/transform_utils/mediadive/__init__.py (100%) rename {kg_bacdive => kg_microbe}/transform_utils/mediadive/mediadive.py (98%) rename {kg_bacdive => kg_microbe}/transform_utils/mediadive/tmp/.keep (100%) rename {kg_bacdive => kg_microbe}/transform_utils/mediadive/tmp/mediadive.tsv (100%) rename {kg_bacdive => kg_microbe}/transform_utils/mediadive/tmp/medium_yaml/.keep (100%) rename {kg_bacdive => kg_microbe}/transform_utils/ontology/__init__.py (100%) rename {kg_bacdive => kg_microbe}/transform_utils/ontology/ontology_transform.py (96%) rename {kg_bacdive => kg_microbe}/transform_utils/traits/__init__.py (100%) rename {kg_bacdive => kg_microbe}/transform_utils/traits/metabolism_map.yaml (100%) rename {kg_bacdive => kg_microbe}/transform_utils/traits/traits.py (98%) rename {kg_bacdive => kg_microbe}/transform_utils/transform.py (98%) rename {kg_bacdive => kg_microbe}/transform_utils/translation_table.yaml (100%) rename {kg_bacdive => kg_microbe}/utils/__init__.py (100%) rename {kg_bacdive => kg_microbe}/utils/ner_utils.py (98%) rename {kg_bacdive => kg_microbe}/utils/pandas_utils.py (97%) rename {kg_bacdive => kg_microbe}/utils/robot_utils.py (99%) diff --git a/.cruft.json b/.cruft.json index 3739584..ee710f6 100644 --- a/.cruft.json +++ b/.cruft.json @@ -4,8 +4,8 @@ "checkout": null, "context": { "cookiecutter": { - "project_name": "kg-bacdive", - "__project_slug": "kg_bacdive", + "project_name": "kg-microbe", + "__project_slug": "kg_microbe", "project_description": "Knowledge graph construction for BacDive data", "min_python_version": "3.9", "full_name": "Harshad Hegde", diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index 4351481..4aca456 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -28,11 +28,11 @@ jobs: - name: Build documentation. run: | - echo ${{ secrets.GH_TOKEN }} >> kg_bacdive/token.txt + echo ${{ secrets.GH_TOKEN }} >> kg_microbe/token.txt mkdir gh-pages touch gh-pages/.nojekyll cd docs/ - poetry run sphinx-apidoc -o . ../kg_bacdive/ --ext-autodoc -f + poetry run sphinx-apidoc -o . ../kg_microbe/ --ext-autodoc -f poetry run sphinx-build -b html . _build cp -r _build/* ../gh-pages/ diff --git a/.github/workflows/qc.yml b/.github/workflows/qc.yml index fb11699..294f97d 100644 --- a/.github/workflows/qc.yml +++ b/.github/workflows/qc.yml @@ -1,4 +1,4 @@ -name: kg-bacdive QC +name: kg-microbe QC on: push: diff --git a/.gitignore b/.gitignore index 3179d6c..8a258c1 100644 --- a/.gitignore +++ b/.gitignore @@ -135,7 +135,7 @@ data/raw/robot !data/raw/.keep !data/raw/exclusion_branches.tsv !data/raw/nlp/* -kg_bacdive/transform_utils/*/tmp/*/*.yaml +kg_microbe/transform_utils/*/tmp/*/*.yaml data/transformed/ontologies/*.tsv *.sqlite data/merged/* diff --git a/README.md b/README.md index 6c22e30..67ba3cf 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# kg-bacdive +# kg-microbe Knowledge graph construction for BacDive data @@ -6,8 +6,8 @@ Knowledge graph construction for BacDive data - Create a vrtual environment of your choice. - Install poetry using `pip install poetry` - `poetry install` - - `git clone https://github.com/Knowledge-Graph-Hub/kg-bacdive.git` - - `cd kg-bacdive` + - `git clone https://github.com/Knowledge-Graph-Hub/kg-microbe.git` + - `cd kg-microbe` ## Download resources needed - `poetry run kg download` : This will download the resources needed for this project. diff --git a/docs/conf.py b/docs/conf.py index 721dd98..99b9a46 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -7,7 +7,7 @@ import re import sys from datetime import date -from kg_bacdive import __version__ +from kg_microbe import __version__ # -- Project information ----------------------------------------------------- # https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information diff --git a/docs/modules.rst b/docs/modules.rst index e07722a..bdb556c 100644 --- a/docs/modules.rst +++ b/docs/modules.rst @@ -4,7 +4,7 @@ kg-microbe .. toctree:: :maxdepth: 4 - kg_bacdive + kg_microbe query_utils run setup diff --git a/kg_bacdive/__init__.py b/kg_microbe/__init__.py similarity index 92% rename from kg_bacdive/__init__.py rename to kg_microbe/__init__.py index eb748c7..c7b9564 100644 --- a/kg_bacdive/__init__.py +++ b/kg_microbe/__init__.py @@ -1,4 +1,4 @@ -"""kg-bacdive package.""" +"""kg-microbe package.""" from importlib import metadata from .download import download diff --git a/kg_bacdive/download.py b/kg_microbe/download.py similarity index 100% rename from kg_bacdive/download.py rename to kg_microbe/download.py diff --git a/kg_bacdive/merge_utils/__init__.py b/kg_microbe/merge_utils/__init__.py similarity index 100% rename from kg_bacdive/merge_utils/__init__.py rename to kg_microbe/merge_utils/__init__.py diff --git a/kg_bacdive/merge_utils/merge_kg.py b/kg_microbe/merge_utils/merge_kg.py similarity index 100% rename from kg_bacdive/merge_utils/merge_kg.py rename to kg_microbe/merge_utils/merge_kg.py diff --git a/kg_bacdive/query.py b/kg_microbe/query.py similarity index 100% rename from kg_bacdive/query.py rename to kg_microbe/query.py diff --git a/kg_bacdive/run.py b/kg_microbe/run.py similarity index 95% rename from kg_bacdive/run.py rename to kg_microbe/run.py index 609803a..4e56d83 100644 --- a/kg_bacdive/run.py +++ b/kg_microbe/run.py @@ -3,11 +3,11 @@ import click -from kg_bacdive import download as kg_download -from kg_bacdive.merge_utils.merge_kg import load_and_merge -from kg_bacdive.query import parse_query_yaml, result_dict_to_tsv, run_query -from kg_bacdive.transform import DATA_SOURCES -from kg_bacdive.transform import transform as kg_transform +from kg_microbe import download as kg_download +from kg_microbe.merge_utils.merge_kg import load_and_merge +from kg_microbe.query import parse_query_yaml, result_dict_to_tsv, run_query +from kg_microbe.transform import DATA_SOURCES +from kg_microbe.transform import transform as kg_transform @click.group() diff --git a/kg_bacdive/transform.py b/kg_microbe/transform.py similarity index 84% rename from kg_bacdive/transform.py rename to kg_microbe/transform.py index 479e2e2..6fcfbfe 100644 --- a/kg_bacdive/transform.py +++ b/kg_microbe/transform.py @@ -3,10 +3,10 @@ from pathlib import Path from typing import List, Optional -from kg_bacdive.transform_utils.bacdive.bacdive import BacDiveTransform -from kg_bacdive.transform_utils.mediadive.mediadive import MediaDiveTransform -from kg_bacdive.transform_utils.ontology.ontology_transform import ONTOLOGIES, OntologyTransform -from kg_bacdive.transform_utils.traits.traits import TraitsTransform +from kg_microbe.transform_utils.bacdive.bacdive import BacDiveTransform +from kg_microbe.transform_utils.mediadive.mediadive import MediaDiveTransform +from kg_microbe.transform_utils.ontology.ontology_transform import ONTOLOGIES, OntologyTransform +from kg_microbe.transform_utils.traits.traits import TraitsTransform DATA_SOURCES = { "OntologyTransform": OntologyTransform, @@ -30,7 +30,7 @@ def transform( """ Transform based on resource and class declared in DATA_SOURCES. - Call scripts in kg_bacdive/transform/[source name]/ to + Call scripts in kg_microbe/transform/[source name]/ to transform each source into a graph format that KGX can ingest directly, in either TSV or JSON format: https://github.com/biolink/kgx/blob/master/data-preparation.md diff --git a/kg_bacdive/transform_utils/__init__.py b/kg_microbe/transform_utils/__init__.py similarity index 100% rename from kg_bacdive/transform_utils/__init__.py rename to kg_microbe/transform_utils/__init__.py diff --git a/kg_bacdive/transform_utils/bacdive/__init__.py b/kg_microbe/transform_utils/bacdive/__init__.py similarity index 100% rename from kg_bacdive/transform_utils/bacdive/__init__.py rename to kg_microbe/transform_utils/bacdive/__init__.py diff --git a/kg_bacdive/transform_utils/bacdive/bacdive.py b/kg_microbe/transform_utils/bacdive/bacdive.py similarity index 98% rename from kg_bacdive/transform_utils/bacdive/bacdive.py rename to kg_microbe/transform_utils/bacdive/bacdive.py index 145a97f..0d1ac00 100644 --- a/kg_bacdive/transform_utils/bacdive/bacdive.py +++ b/kg_microbe/transform_utils/bacdive/bacdive.py @@ -21,7 +21,7 @@ from oaklib import get_adapter from tqdm import tqdm -from kg_bacdive.transform_utils.constants import ( +from kg_microbe.transform_utils.constants import ( BACDIVE_API_BASE_URL, BACDIVE_ID_COLUMN, BACDIVE_MEDIUM_DICT, @@ -60,8 +60,8 @@ SPECIES, STRAIN, ) -from kg_bacdive.transform_utils.transform import Transform -from kg_bacdive.utils.pandas_utils import drop_duplicates +from kg_microbe.transform_utils.transform import Transform +from kg_microbe.utils.pandas_utils import drop_duplicates class BacDiveTransform(Transform): diff --git a/kg_bacdive/transform_utils/bacdive/tmp/.keep b/kg_microbe/transform_utils/bacdive/tmp/.keep similarity index 100% rename from kg_bacdive/transform_utils/bacdive/tmp/.keep rename to kg_microbe/transform_utils/bacdive/tmp/.keep diff --git a/kg_bacdive/transform_utils/bacdive/tmp/bacdive.tsv b/kg_microbe/transform_utils/bacdive/tmp/bacdive.tsv similarity index 100% rename from kg_bacdive/transform_utils/bacdive/tmp/bacdive.tsv rename to kg_microbe/transform_utils/bacdive/tmp/bacdive.tsv diff --git a/kg_bacdive/transform_utils/bacdive/tmp/yaml/.keep b/kg_microbe/transform_utils/bacdive/tmp/yaml/.keep similarity index 100% rename from kg_bacdive/transform_utils/bacdive/tmp/yaml/.keep rename to kg_microbe/transform_utils/bacdive/tmp/yaml/.keep diff --git a/kg_bacdive/transform_utils/constants.py b/kg_microbe/transform_utils/constants.py similarity index 100% rename from kg_bacdive/transform_utils/constants.py rename to kg_microbe/transform_utils/constants.py diff --git a/kg_bacdive/transform_utils/example_transform/__init__.py b/kg_microbe/transform_utils/example_transform/__init__.py similarity index 100% rename from kg_bacdive/transform_utils/example_transform/__init__.py rename to kg_microbe/transform_utils/example_transform/__init__.py diff --git a/kg_bacdive/transform_utils/example_transform/example_transform.py b/kg_microbe/transform_utils/example_transform/example_transform.py similarity index 97% rename from kg_bacdive/transform_utils/example_transform/example_transform.py rename to kg_microbe/transform_utils/example_transform/example_transform.py index 3c3367e..18e415e 100644 --- a/kg_bacdive/transform_utils/example_transform/example_transform.py +++ b/kg_microbe/transform_utils/example_transform/example_transform.py @@ -20,7 +20,7 @@ from transform_utils.transform import Transform -from kg_bacdive.utils.robot_utils import convert_to_json, extract_convert_to_json +from kg_microbe.utils.robot_utils import convert_to_json, extract_convert_to_json class YourTransform(Transform): diff --git a/kg_bacdive/transform_utils/mediadive/__init__.py b/kg_microbe/transform_utils/mediadive/__init__.py similarity index 100% rename from kg_bacdive/transform_utils/mediadive/__init__.py rename to kg_microbe/transform_utils/mediadive/__init__.py diff --git a/kg_bacdive/transform_utils/mediadive/mediadive.py b/kg_microbe/transform_utils/mediadive/mediadive.py similarity index 98% rename from kg_bacdive/transform_utils/mediadive/mediadive.py rename to kg_microbe/transform_utils/mediadive/mediadive.py index a0d174c..0d4efba 100644 --- a/kg_bacdive/transform_utils/mediadive/mediadive.py +++ b/kg_microbe/transform_utils/mediadive/mediadive.py @@ -27,7 +27,7 @@ from oaklib import get_adapter from tqdm import tqdm -from kg_bacdive.transform_utils.constants import ( +from kg_microbe.transform_utils.constants import ( CAS_RN_KEY, CAS_RN_PREFIX, CHEBI_KEY, @@ -71,8 +71,8 @@ SOLUTIONS_COLUMN, SOLUTIONS_KEY, ) -from kg_bacdive.transform_utils.transform import Transform -from kg_bacdive.utils.pandas_utils import drop_duplicates, establish_transitive_relationship +from kg_microbe.transform_utils.transform import Transform +from kg_microbe.utils.pandas_utils import drop_duplicates, establish_transitive_relationship class MediaDiveTransform(Transform): diff --git a/kg_bacdive/transform_utils/mediadive/tmp/.keep b/kg_microbe/transform_utils/mediadive/tmp/.keep similarity index 100% rename from kg_bacdive/transform_utils/mediadive/tmp/.keep rename to kg_microbe/transform_utils/mediadive/tmp/.keep diff --git a/kg_bacdive/transform_utils/mediadive/tmp/mediadive.tsv b/kg_microbe/transform_utils/mediadive/tmp/mediadive.tsv similarity index 100% rename from kg_bacdive/transform_utils/mediadive/tmp/mediadive.tsv rename to kg_microbe/transform_utils/mediadive/tmp/mediadive.tsv diff --git a/kg_bacdive/transform_utils/mediadive/tmp/medium_yaml/.keep b/kg_microbe/transform_utils/mediadive/tmp/medium_yaml/.keep similarity index 100% rename from kg_bacdive/transform_utils/mediadive/tmp/medium_yaml/.keep rename to kg_microbe/transform_utils/mediadive/tmp/medium_yaml/.keep diff --git a/kg_bacdive/transform_utils/ontology/__init__.py b/kg_microbe/transform_utils/ontology/__init__.py similarity index 100% rename from kg_bacdive/transform_utils/ontology/__init__.py rename to kg_microbe/transform_utils/ontology/__init__.py diff --git a/kg_bacdive/transform_utils/ontology/ontology_transform.py b/kg_microbe/transform_utils/ontology/ontology_transform.py similarity index 96% rename from kg_bacdive/transform_utils/ontology/ontology_transform.py rename to kg_microbe/transform_utils/ontology/ontology_transform.py index 364b260..ba78787 100644 --- a/kg_bacdive/transform_utils/ontology/ontology_transform.py +++ b/kg_microbe/transform_utils/ontology/ontology_transform.py @@ -7,12 +7,12 @@ # from kgx.transformer import Transformer from kgx.cli.cli_utils import transform -from kg_bacdive.transform_utils.constants import ( +from kg_microbe.transform_utils.constants import ( EXCLUSION_TERMS_FILE, NCBITAXON_PREFIX, ROBOT_REMOVED_SUFFIX, ) -from kg_bacdive.utils.robot_utils import convert_to_json, remove_convert_to_json +from kg_microbe.utils.robot_utils import convert_to_json, remove_convert_to_json from ..transform import Transform diff --git a/kg_bacdive/transform_utils/traits/__init__.py b/kg_microbe/transform_utils/traits/__init__.py similarity index 100% rename from kg_bacdive/transform_utils/traits/__init__.py rename to kg_microbe/transform_utils/traits/__init__.py diff --git a/kg_bacdive/transform_utils/traits/metabolism_map.yaml b/kg_microbe/transform_utils/traits/metabolism_map.yaml similarity index 100% rename from kg_bacdive/transform_utils/traits/metabolism_map.yaml rename to kg_microbe/transform_utils/traits/metabolism_map.yaml diff --git a/kg_bacdive/transform_utils/traits/traits.py b/kg_microbe/transform_utils/traits/traits.py similarity index 98% rename from kg_bacdive/transform_utils/traits/traits.py rename to kg_microbe/transform_utils/traits/traits.py index 6ebc86e..a871d0e 100644 --- a/kg_bacdive/transform_utils/traits/traits.py +++ b/kg_microbe/transform_utils/traits/traits.py @@ -9,7 +9,7 @@ import yaml from oaklib.utilities.ner_utilities import get_exclusion_token_list -from kg_bacdive.transform_utils.constants import ( +from kg_microbe.transform_utils.constants import ( ACTUAL_TERM_KEY, BIOLOGICAL_PROCESS, CARBON_SUBSTRATE_CATEGORY, @@ -48,9 +48,9 @@ TROPHICALLY_INTERACTS_WITH, TYPE_COLUMN, ) -from kg_bacdive.transform_utils.transform import Transform -from kg_bacdive.utils.ner_utils import annotate -from kg_bacdive.utils.pandas_utils import drop_duplicates +from kg_microbe.transform_utils.transform import Transform +from kg_microbe.utils.ner_utils import annotate +from kg_microbe.utils.pandas_utils import drop_duplicates OUTPUT_FILE_SUFFIX = "_ner.tsv" STOPWORDS_FN = "stopwords.txt" diff --git a/kg_bacdive/transform_utils/transform.py b/kg_microbe/transform_utils/transform.py similarity index 98% rename from kg_bacdive/transform_utils/transform.py rename to kg_microbe/transform_utils/transform.py index abd6985..be01466 100644 --- a/kg_bacdive/transform_utils/transform.py +++ b/kg_microbe/transform_utils/transform.py @@ -5,7 +5,7 @@ import yaml -from kg_bacdive.transform_utils.constants import ( +from kg_microbe.transform_utils.constants import ( CATEGORY_COLUMN, DESCRIPTION_COLUMN, ID_COLUMN, diff --git a/kg_bacdive/transform_utils/translation_table.yaml b/kg_microbe/transform_utils/translation_table.yaml similarity index 100% rename from kg_bacdive/transform_utils/translation_table.yaml rename to kg_microbe/transform_utils/translation_table.yaml diff --git a/kg_bacdive/utils/__init__.py b/kg_microbe/utils/__init__.py similarity index 100% rename from kg_bacdive/utils/__init__.py rename to kg_microbe/utils/__init__.py diff --git a/kg_bacdive/utils/ner_utils.py b/kg_microbe/utils/ner_utils.py similarity index 98% rename from kg_bacdive/utils/ner_utils.py rename to kg_microbe/utils/ner_utils.py index e819730..9894d56 100644 --- a/kg_bacdive/utils/ner_utils.py +++ b/kg_microbe/utils/ner_utils.py @@ -7,7 +7,7 @@ from oaklib import get_adapter from oaklib.datamodels.text_annotator import TextAnnotationConfiguration -from kg_bacdive.transform_utils.constants import ( +from kg_microbe.transform_utils.constants import ( END_COLUMN, MATCHES_WHOLE_TEXT_COLUMN, OBJECT_ALIASES_COLUMN, diff --git a/kg_bacdive/utils/pandas_utils.py b/kg_microbe/utils/pandas_utils.py similarity index 97% rename from kg_bacdive/utils/pandas_utils.py rename to kg_microbe/utils/pandas_utils.py index 0402936..e71a4e2 100644 --- a/kg_bacdive/utils/pandas_utils.py +++ b/kg_microbe/utils/pandas_utils.py @@ -3,7 +3,7 @@ import pandas as pd -from kg_bacdive.transform_utils.constants import OBJECT_COLUMN, PREDICATE_COLUMN, SUBJECT_COLUMN +from kg_microbe.transform_utils.constants import OBJECT_COLUMN, PREDICATE_COLUMN, SUBJECT_COLUMN def drop_duplicates(file_path: Path): diff --git a/kg_bacdive/utils/robot_utils.py b/kg_microbe/utils/robot_utils.py similarity index 99% rename from kg_bacdive/utils/robot_utils.py rename to kg_microbe/utils/robot_utils.py index d453ab2..6e861bf 100644 --- a/kg_bacdive/utils/robot_utils.py +++ b/kg_microbe/utils/robot_utils.py @@ -4,7 +4,7 @@ from pathlib import Path from typing import List, Union -from kg_bacdive.transform_utils.constants import ( +from kg_microbe.transform_utils.constants import ( ROBOT_REMOVED_SUFFIX, ) diff --git a/merge.yaml b/merge.yaml index 99dcd65..ff1a2b0 100644 --- a/merge.yaml +++ b/merge.yaml @@ -12,7 +12,7 @@ configuration: # define the type for non-canonical properties for RDF export merged_graph: - name: kg-bacdive graph + name: kg-microbe graph source: ncbitaxon: name: "NCBITaxon" @@ -52,7 +52,7 @@ merged_graph: operations: - name: kgx.graph_operations.summarize_graph.generate_graph_stats args: - graph_name: kg-bacdive graph + graph_name: kg-microbe graph filename: merged_graph_stats.yaml node_facet_properties: - provided_by @@ -67,4 +67,4 @@ merged_graph: # merged-kg-nt: # format: nt # compression: gz - # filename: kg_bacdive.nt.gz \ No newline at end of file + # filename: kg_microbe.nt.gz \ No newline at end of file diff --git a/merged_graph_stats.yaml b/merged_graph_stats.yaml index 2b842a5..62e78a8 100644 --- a/merged_graph_stats.yaml +++ b/merged_graph_stats.yaml @@ -465,7 +465,7 @@ edge_stats: source: - unknown total_edges: 1341461 -graph_name: kg-bacdive graph +graph_name: kg-microbe graph node_stats: count_by_category: biolink:AbstractEntity: diff --git a/notebook/kg_bacdive.ipynb b/notebook/kg_bacdive.ipynb index 19fccb2..42785df 100644 --- a/notebook/kg_bacdive.ipynb +++ b/notebook/kg_bacdive.ipynb @@ -640,7 +640,7 @@ "source": [ "from grape import Graph\n", "\n", - "kg_bacdive = Graph.from_csv(\n", + "kg_microbe = Graph.from_csv(\n", " # Edges related parameters\n", "\n", " ## The path to the edges list tsv\n", diff --git a/pyproject.toml b/pyproject.toml index 5327bd8..a8507c0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [tool.poetry] -name = "kg-bacdive" +name = "kg-microbe" version = "0.0.0" -description = "kg-bacdive" +description = "kg-microbe" authors = ["Harshad Hegde "] license = "MIT" readme = "README.md" @@ -44,7 +44,7 @@ docs = [ ] [tool.poetry.scripts] -kg = 'kg_bacdive.run:main' +kg = 'kg_microbe.run:main' [tool.poetry-dynamic-versioning] enable = true diff --git a/templates/README.build b/templates/README.build index 0fa3b1f..8a81a15 100644 --- a/templates/README.build +++ b/templates/README.build @@ -1,10 +1,10 @@ -The files in this directory represent a build of the kg-bacdive knowledge graph. +The files in this directory represent a build of the kg-microbe knowledge graph. These file include: * Jenkinsfile - the exact command run to produce this build of the KG - * kg-bacdive.jnl.gz - a blazegraph journal that can be loaded to produce a Blazegraph endpoint - * kg-bacdive.nt.gz- an ntriples/RDF version of the KG - * kg-bacdive.tar.gz - a tar.gz file containing the KG in KGX TSV format (with 'merged-kg' within the name of both node and edge files) + * kg-microbe.jnl.gz - a blazegraph journal that can be loaded to produce a Blazegraph endpoint + * kg-microbe.nt.gz- an ntriples/RDF version of the KG + * kg-microbe.tar.gz - a tar.gz file containing the KG in KGX TSV format (with 'merged-kg' within the name of both node and edge files) The subdirectories in this directory are: diff --git a/templates/README.toplevel b/templates/README.toplevel index c825a71..ecfbdeb 100644 --- a/templates/README.toplevel +++ b/templates/README.toplevel @@ -1,4 +1,4 @@ -The subdirectories here each contain a build of the kg-bacdive knowledge graph. +The subdirectories here each contain a build of the kg-microbe knowledge graph. The directories are named with a date (ISO 8601 format, YYYYMMDD) according to when the build was produced. The current/ directory is the most recent build. diff --git a/tests/__init__.py b/tests/__init__.py index 6afba72..67be099 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1 +1 @@ -"""Tests for kg-bacdive.""" +"""Tests for kg-microbe.""" diff --git a/tests/demo_test.py b/tests/demo_test.py index a86948a..e8780d1 100644 --- a/tests/demo_test.py +++ b/tests/demo_test.py @@ -2,7 +2,7 @@ import unittest -from kg_bacdive import __version__ +from kg_microbe import __version__ class TestVersion(unittest.TestCase): diff --git a/tox.ini b/tox.ini index 29d2264..7689082 100644 --- a/tox.ini +++ b/tox.ini @@ -38,8 +38,8 @@ deps = ruff skip_install = true commands = - black kg_bacdive/ tests/ - ruff --fix kg_bacdive/ tests/ + black kg_microbe/ tests/ + ruff --fix kg_microbe/ tests/ description = Run linters. # This is used for QC checks. @@ -49,8 +49,8 @@ deps = ruff skip_install = true commands = - black --check --diff kg_bacdive/ tests/ - ruff check kg_bacdive/ tests/ + black --check --diff kg_microbe/ tests/ + ruff check kg_microbe/ tests/ description = Run linters. [testenv:doclint] @@ -67,7 +67,7 @@ skip_install = true deps = codespell tomli # required for getting config from pyproject.toml -commands = codespell kg_bacdive/ tests/ -S kg_bacdive/transform_utils/*/tmp/* +commands = codespell kg_microbe/ tests/ -S kg_microbe/transform_utils/*/tmp/* [testenv:codespell-write] description = Run spell checker and write corrections. @@ -75,12 +75,12 @@ skip_install = true deps = codespell tomli -commands = codespell kg_bacdive/ tests/ --write-changes -S kg_bacdive/transform_utils/*/tmp/* +commands = codespell kg_microbe/ tests/ --write-changes -S kg_microbe/transform_utils/*/tmp/* [testenv:docstr-coverage] skip_install = true deps = docstr-coverage commands = - docstr-coverage kg_bacdive/ tests/ --skip-private --skip-magic + docstr-coverage kg_microbe/ tests/ --skip-private --skip-magic description = Run the docstr-coverage tool to check documentation coverage \ No newline at end of file