From 3db047eec904a2909eecbd6336d502bf63d126de Mon Sep 17 00:00:00 2001 From: Shashank Mittal Date: Mon, 25 Mar 2024 00:57:39 +0530 Subject: [PATCH 1/4] remove modification of sys.path Signed-off-by: Shashank Mittal --- .../languages/English/nouns/format_nouns.py | 6 +----- .../languages/English/translations/translate_words.py | 6 +----- .../languages/English/verbs/format_verbs.py | 6 +----- .../languages/French/nouns/format_nouns.py | 6 +----- .../languages/French/translations/translate_words.py | 6 +----- .../languages/French/verbs/format_verbs.py | 6 +----- .../languages/German/nouns/format_nouns.py | 6 +----- .../German/prepositions/format_prepositions.py | 6 +----- .../languages/German/translations/translate_words.py | 6 +----- .../languages/German/verbs/format_verbs.py | 6 +----- .../languages/Italian/nouns/format_nouns.py | 6 +----- .../languages/Italian/verbs/format_verbs.py | 6 +----- .../languages/Portuguese/nouns/format_nouns.py | 6 +----- .../Portuguese/translations/translate_words.py | 6 +----- .../languages/Portuguese/verbs/format_verbs.py | 6 +----- .../languages/Russian/nouns/format_nouns.py | 6 +----- .../Russian/prepositions/format_prepositions.py | 6 +----- .../languages/Russian/translations/translate_words.py | 6 +----- .../languages/Russian/verbs/format_verbs.py | 6 +----- .../languages/Spanish/nouns/format_nouns.py | 6 +----- .../languages/Spanish/verbs/format_verbs.py | 6 +----- .../languages/Swedish/nouns/format_nouns.py | 6 +----- .../languages/Swedish/translations/translate_words.py | 6 +----- .../languages/Swedish/verbs/format_verbs.py | 6 +----- src/scribe_data/extract_transform/update_data.py | 6 +----- .../extract_transform/update_words_to_translate.py | 6 +----- src/scribe_data/load/data_to_sqlite.py | 6 +----- src/scribe_data/load/send_dbs_to_scribe.py | 6 +----- src/scribe_data/utils.py | 10 +++++----- 29 files changed, 33 insertions(+), 145 deletions(-) diff --git a/src/scribe_data/extract_transform/languages/English/nouns/format_nouns.py b/src/scribe_data/extract_transform/languages/English/nouns/format_nouns.py index 5356c0543..235522b2f 100644 --- a/src/scribe_data/extract_transform/languages/English/nouns/format_nouns.py +++ b/src/scribe_data/extract_transform/languages/English/nouns/format_nouns.py @@ -6,11 +6,7 @@ import os import sys -PATH_TO_SCRIBE_ORG = os.path.dirname(sys.path[0]).split("Scribe-Data")[0] -PATH_TO_SCRIBE_DATA_SRC = f"{PATH_TO_SCRIBE_ORG}Scribe-Data/src" -sys.path.insert(0, PATH_TO_SCRIBE_DATA_SRC) - -from scribe_data.utils import export_formatted_data, load_queried_data # noqa: E402 +from scribe_data.utils import export_formatted_data, load_queried_data file_path = sys.argv[0] diff --git a/src/scribe_data/extract_transform/languages/English/translations/translate_words.py b/src/scribe_data/extract_transform/languages/English/translations/translate_words.py index fad6e9ec4..a8aee55c4 100644 --- a/src/scribe_data/extract_transform/languages/English/translations/translate_words.py +++ b/src/scribe_data/extract_transform/languages/English/translations/translate_words.py @@ -10,11 +10,7 @@ import os import sys -PATH_TO_SCRIBE_ORG = os.path.dirname(sys.path[0]).split("Scribe-Data")[0] -PATH_TO_SCRIBE_DATA_SRC = f"{PATH_TO_SCRIBE_ORG}Scribe-Data/src" -sys.path.insert(0, PATH_TO_SCRIBE_DATA_SRC) - -from scribe_data.utils import translate_to_other_languages # noqa: E402 +from scribe_data.utils import translate_to_other_languages SRC_LANG = "English" translate_script_dir = os.path.dirname(os.path.abspath(__file__)) diff --git a/src/scribe_data/extract_transform/languages/English/verbs/format_verbs.py b/src/scribe_data/extract_transform/languages/English/verbs/format_verbs.py index 92c429277..aadd3ec7c 100644 --- a/src/scribe_data/extract_transform/languages/English/verbs/format_verbs.py +++ b/src/scribe_data/extract_transform/languages/English/verbs/format_verbs.py @@ -6,11 +6,7 @@ import os import sys -PATH_TO_SCRIBE_ORG = os.path.dirname(sys.path[0]).split("Scribe-Data")[0] -PATH_TO_SCRIBE_DATA_SRC = f"{PATH_TO_SCRIBE_ORG}Scribe-Data/src" -sys.path.insert(0, PATH_TO_SCRIBE_DATA_SRC) - -from scribe_data.utils import export_formatted_data, load_queried_data # noqa: E402 +from scribe_data.utils import export_formatted_data, load_queried_data file_path = sys.argv[0] diff --git a/src/scribe_data/extract_transform/languages/French/nouns/format_nouns.py b/src/scribe_data/extract_transform/languages/French/nouns/format_nouns.py index 7ea0576da..b4082b406 100644 --- a/src/scribe_data/extract_transform/languages/French/nouns/format_nouns.py +++ b/src/scribe_data/extract_transform/languages/French/nouns/format_nouns.py @@ -6,11 +6,7 @@ import os import sys -PATH_TO_SCRIBE_ORG = os.path.dirname(sys.path[0]).split("Scribe-Data")[0] -PATH_TO_SCRIBE_DATA_SRC = f"{PATH_TO_SCRIBE_ORG}Scribe-Data/src" -sys.path.insert(0, PATH_TO_SCRIBE_DATA_SRC) - -from scribe_data.utils import ( # noqa: E402 +from scribe_data.utils import ( export_formatted_data, load_queried_data, map_genders, diff --git a/src/scribe_data/extract_transform/languages/French/translations/translate_words.py b/src/scribe_data/extract_transform/languages/French/translations/translate_words.py index a8177bdb7..5100406ce 100644 --- a/src/scribe_data/extract_transform/languages/French/translations/translate_words.py +++ b/src/scribe_data/extract_transform/languages/French/translations/translate_words.py @@ -10,11 +10,7 @@ import os import sys -PATH_TO_SCRIBE_ORG = os.path.dirname(sys.path[0]).split("Scribe-Data")[0] -PATH_TO_SCRIBE_DATA_SRC = f"{PATH_TO_SCRIBE_ORG}Scribe-Data/src" -sys.path.insert(0, PATH_TO_SCRIBE_DATA_SRC) - -from scribe_data.utils import translate_to_other_languages # noqa: E402 +from scribe_data.utils import translate_to_other_languages SRC_LANG = "French" translate_script_dir = os.path.dirname(os.path.abspath(__file__)) diff --git a/src/scribe_data/extract_transform/languages/French/verbs/format_verbs.py b/src/scribe_data/extract_transform/languages/French/verbs/format_verbs.py index c2b9e3679..9c08f37da 100644 --- a/src/scribe_data/extract_transform/languages/French/verbs/format_verbs.py +++ b/src/scribe_data/extract_transform/languages/French/verbs/format_verbs.py @@ -6,11 +6,7 @@ import os import sys -PATH_TO_SCRIBE_ORG = os.path.dirname(sys.path[0]).split("Scribe-Data")[0] -PATH_TO_SCRIBE_DATA_SRC = f"{PATH_TO_SCRIBE_ORG}Scribe-Data/src" -sys.path.insert(0, PATH_TO_SCRIBE_DATA_SRC) - -from scribe_data.utils import export_formatted_data, load_queried_data # noqa: E402 +from scribe_data.utils import export_formatted_data, load_queried_data file_path = sys.argv[0] diff --git a/src/scribe_data/extract_transform/languages/German/nouns/format_nouns.py b/src/scribe_data/extract_transform/languages/German/nouns/format_nouns.py index 557903c5d..13e38a245 100644 --- a/src/scribe_data/extract_transform/languages/German/nouns/format_nouns.py +++ b/src/scribe_data/extract_transform/languages/German/nouns/format_nouns.py @@ -6,11 +6,7 @@ import os import sys -PATH_TO_SCRIBE_ORG = os.path.dirname(sys.path[0]).split("Scribe-Data")[0] -PATH_TO_SCRIBE_DATA_SRC = f"{PATH_TO_SCRIBE_ORG}Scribe-Data/src" -sys.path.insert(0, PATH_TO_SCRIBE_DATA_SRC) - -from scribe_data.utils import ( # noqa: E402 +from scribe_data.utils import ( export_formatted_data, load_queried_data, map_genders, diff --git a/src/scribe_data/extract_transform/languages/German/prepositions/format_prepositions.py b/src/scribe_data/extract_transform/languages/German/prepositions/format_prepositions.py index d03e209bb..23474712c 100644 --- a/src/scribe_data/extract_transform/languages/German/prepositions/format_prepositions.py +++ b/src/scribe_data/extract_transform/languages/German/prepositions/format_prepositions.py @@ -6,11 +6,7 @@ import os import sys -PATH_TO_SCRIBE_ORG = os.path.dirname(sys.path[0]).split("Scribe-Data")[0] -PATH_TO_SCRIBE_DATA_SRC = f"{PATH_TO_SCRIBE_ORG}Scribe-Data/src" -sys.path.insert(0, PATH_TO_SCRIBE_DATA_SRC) - -from scribe_data.utils import export_formatted_data, load_queried_data # noqa: E402 +from scribe_data.utils import export_formatted_data, load_queried_data file_path = sys.argv[0] diff --git a/src/scribe_data/extract_transform/languages/German/translations/translate_words.py b/src/scribe_data/extract_transform/languages/German/translations/translate_words.py index e838530e5..2abe27147 100644 --- a/src/scribe_data/extract_transform/languages/German/translations/translate_words.py +++ b/src/scribe_data/extract_transform/languages/German/translations/translate_words.py @@ -10,11 +10,7 @@ import os import sys -PATH_TO_SCRIBE_ORG = os.path.dirname(sys.path[0]).split("Scribe-Data")[0] -PATH_TO_SCRIBE_DATA_SRC = f"{PATH_TO_SCRIBE_ORG}Scribe-Data/src" -sys.path.insert(0, PATH_TO_SCRIBE_DATA_SRC) - -from scribe_data.utils import translate_to_other_languages # noqa: E402 +from scribe_data.utils import translate_to_other_languages SRC_LANG = "German" translate_script_dir = os.path.dirname(os.path.abspath(__file__)) diff --git a/src/scribe_data/extract_transform/languages/German/verbs/format_verbs.py b/src/scribe_data/extract_transform/languages/German/verbs/format_verbs.py index 5a6bda6ee..28bded81c 100644 --- a/src/scribe_data/extract_transform/languages/German/verbs/format_verbs.py +++ b/src/scribe_data/extract_transform/languages/German/verbs/format_verbs.py @@ -11,11 +11,7 @@ import os import sys -PATH_TO_SCRIBE_ORG = os.path.dirname(sys.path[0]).split("Scribe-Data")[0] -PATH_TO_SCRIBE_DATA_SRC = f"{PATH_TO_SCRIBE_ORG}Scribe-Data/src" -sys.path.insert(0, PATH_TO_SCRIBE_DATA_SRC) - -from scribe_data.utils import export_formatted_data, load_queried_data # noqa: E402 +from scribe_data.utils import export_formatted_data, load_queried_data file_path = sys.argv[0] diff --git a/src/scribe_data/extract_transform/languages/Italian/nouns/format_nouns.py b/src/scribe_data/extract_transform/languages/Italian/nouns/format_nouns.py index 99566f596..5e35e194a 100644 --- a/src/scribe_data/extract_transform/languages/Italian/nouns/format_nouns.py +++ b/src/scribe_data/extract_transform/languages/Italian/nouns/format_nouns.py @@ -6,11 +6,7 @@ import os import sys -PATH_TO_SCRIBE_ORG = os.path.dirname(sys.path[0]).split("Scribe-Data")[0] -PATH_TO_SCRIBE_DATA_SRC = f"{PATH_TO_SCRIBE_ORG}Scribe-Data/src" -sys.path.insert(0, PATH_TO_SCRIBE_DATA_SRC) - -from scribe_data.utils import ( # noqa: E402 +from scribe_data.utils import ( export_formatted_data, load_queried_data, map_genders, diff --git a/src/scribe_data/extract_transform/languages/Italian/verbs/format_verbs.py b/src/scribe_data/extract_transform/languages/Italian/verbs/format_verbs.py index 95bb2a356..f16616bf4 100644 --- a/src/scribe_data/extract_transform/languages/Italian/verbs/format_verbs.py +++ b/src/scribe_data/extract_transform/languages/Italian/verbs/format_verbs.py @@ -6,11 +6,7 @@ import os import sys -PATH_TO_SCRIBE_ORG = os.path.dirname(sys.path[0]).split("Scribe-Data")[0] -PATH_TO_SCRIBE_DATA_SRC = f"{PATH_TO_SCRIBE_ORG}Scribe-Data/src" -sys.path.insert(0, PATH_TO_SCRIBE_DATA_SRC) - -from scribe_data.utils import export_formatted_data, load_queried_data # noqa: E402 +from scribe_data.utils import export_formatted_data, load_queried_data file_path = sys.argv[0] diff --git a/src/scribe_data/extract_transform/languages/Portuguese/nouns/format_nouns.py b/src/scribe_data/extract_transform/languages/Portuguese/nouns/format_nouns.py index 6c84b6ec2..09091e793 100644 --- a/src/scribe_data/extract_transform/languages/Portuguese/nouns/format_nouns.py +++ b/src/scribe_data/extract_transform/languages/Portuguese/nouns/format_nouns.py @@ -6,11 +6,7 @@ import os import sys -PATH_TO_SCRIBE_ORG = os.path.dirname(sys.path[0]).split("Scribe-Data")[0] -PATH_TO_SCRIBE_DATA_SRC = f"{PATH_TO_SCRIBE_ORG}Scribe-Data/src" -sys.path.insert(0, PATH_TO_SCRIBE_DATA_SRC) - -from scribe_data.utils import ( # noqa: E402 +from scribe_data.utils import ( export_formatted_data, load_queried_data, map_genders, diff --git a/src/scribe_data/extract_transform/languages/Portuguese/translations/translate_words.py b/src/scribe_data/extract_transform/languages/Portuguese/translations/translate_words.py index 884083d8f..d25ff2b65 100644 --- a/src/scribe_data/extract_transform/languages/Portuguese/translations/translate_words.py +++ b/src/scribe_data/extract_transform/languages/Portuguese/translations/translate_words.py @@ -10,11 +10,7 @@ import os import sys -PATH_TO_SCRIBE_ORG = os.path.dirname(sys.path[0]).split("Scribe-Data")[0] -PATH_TO_SCRIBE_DATA_SRC = f"{PATH_TO_SCRIBE_ORG}Scribe-Data/src" -sys.path.insert(0, PATH_TO_SCRIBE_DATA_SRC) - -from scribe_data.utils import translate_to_other_languages # noqa: E402 +from scribe_data.utils import translate_to_other_languages SRC_LANG = "Portuguese" translate_script_dir = os.path.dirname(os.path.abspath(__file__)) diff --git a/src/scribe_data/extract_transform/languages/Portuguese/verbs/format_verbs.py b/src/scribe_data/extract_transform/languages/Portuguese/verbs/format_verbs.py index c71ed07f0..4405a111f 100644 --- a/src/scribe_data/extract_transform/languages/Portuguese/verbs/format_verbs.py +++ b/src/scribe_data/extract_transform/languages/Portuguese/verbs/format_verbs.py @@ -6,11 +6,7 @@ import os import sys -PATH_TO_SCRIBE_ORG = os.path.dirname(sys.path[0]).split("Scribe-Data")[0] -PATH_TO_SCRIBE_DATA_SRC = f"{PATH_TO_SCRIBE_ORG}Scribe-Data/src" -sys.path.insert(0, PATH_TO_SCRIBE_DATA_SRC) - -from scribe_data.utils import export_formatted_data, load_queried_data # noqa: E402 +from scribe_data.utils import export_formatted_data, load_queried_data file_path = sys.argv[0] diff --git a/src/scribe_data/extract_transform/languages/Russian/nouns/format_nouns.py b/src/scribe_data/extract_transform/languages/Russian/nouns/format_nouns.py index 0fb2d20a9..af95db3c2 100644 --- a/src/scribe_data/extract_transform/languages/Russian/nouns/format_nouns.py +++ b/src/scribe_data/extract_transform/languages/Russian/nouns/format_nouns.py @@ -6,11 +6,7 @@ import os import sys -PATH_TO_SCRIBE_ORG = os.path.dirname(sys.path[0]).split("Scribe-Data")[0] -PATH_TO_SCRIBE_DATA_SRC = f"{PATH_TO_SCRIBE_ORG}Scribe-Data/src" -sys.path.insert(0, PATH_TO_SCRIBE_DATA_SRC) - -from scribe_data.utils import ( # noqa: E402 +from scribe_data.utils import ( export_formatted_data, load_queried_data, map_genders, diff --git a/src/scribe_data/extract_transform/languages/Russian/prepositions/format_prepositions.py b/src/scribe_data/extract_transform/languages/Russian/prepositions/format_prepositions.py index 8702881ec..0df16a979 100644 --- a/src/scribe_data/extract_transform/languages/Russian/prepositions/format_prepositions.py +++ b/src/scribe_data/extract_transform/languages/Russian/prepositions/format_prepositions.py @@ -6,11 +6,7 @@ import os import sys -PATH_TO_SCRIBE_ORG = os.path.dirname(sys.path[0]).split("Scribe-Data")[0] -PATH_TO_SCRIBE_DATA_SRC = f"{PATH_TO_SCRIBE_ORG}Scribe-Data/src" -sys.path.insert(0, PATH_TO_SCRIBE_DATA_SRC) - -from scribe_data.utils import export_formatted_data, load_queried_data # noqa: E402 +from scribe_data.utils import export_formatted_data, load_queried_data file_path = sys.argv[0] diff --git a/src/scribe_data/extract_transform/languages/Russian/translations/translate_words.py b/src/scribe_data/extract_transform/languages/Russian/translations/translate_words.py index a2b78e8f1..56542ed9e 100644 --- a/src/scribe_data/extract_transform/languages/Russian/translations/translate_words.py +++ b/src/scribe_data/extract_transform/languages/Russian/translations/translate_words.py @@ -10,11 +10,7 @@ import os import sys -PATH_TO_SCRIBE_ORG = os.path.dirname(sys.path[0]).split("Scribe-Data")[0] -PATH_TO_SCRIBE_DATA_SRC = f"{PATH_TO_SCRIBE_ORG}Scribe-Data/src" -sys.path.insert(0, PATH_TO_SCRIBE_DATA_SRC) - -from scribe_data.utils import translate_to_other_languages # noqa: E402 +from scribe_data.utils import translate_to_other_languages SRC_LANG = "Russian" translate_script_dir = os.path.dirname(os.path.abspath(__file__)) diff --git a/src/scribe_data/extract_transform/languages/Russian/verbs/format_verbs.py b/src/scribe_data/extract_transform/languages/Russian/verbs/format_verbs.py index 7b3d49a13..34f19d57b 100644 --- a/src/scribe_data/extract_transform/languages/Russian/verbs/format_verbs.py +++ b/src/scribe_data/extract_transform/languages/Russian/verbs/format_verbs.py @@ -6,11 +6,7 @@ import os import sys -PATH_TO_SCRIBE_ORG = os.path.dirname(sys.path[0]).split("Scribe-Data")[0] -PATH_TO_SCRIBE_DATA_SRC = f"{PATH_TO_SCRIBE_ORG}Scribe-Data/src" -sys.path.insert(0, PATH_TO_SCRIBE_DATA_SRC) - -from scribe_data.utils import export_formatted_data, load_queried_data # noqa: E402 +from scribe_data.utils import export_formatted_data, load_queried_data file_path = sys.argv[0] diff --git a/src/scribe_data/extract_transform/languages/Spanish/nouns/format_nouns.py b/src/scribe_data/extract_transform/languages/Spanish/nouns/format_nouns.py index ff552e162..29a14e3f8 100644 --- a/src/scribe_data/extract_transform/languages/Spanish/nouns/format_nouns.py +++ b/src/scribe_data/extract_transform/languages/Spanish/nouns/format_nouns.py @@ -6,11 +6,7 @@ import os import sys -PATH_TO_SCRIBE_ORG = os.path.dirname(sys.path[0]).split("Scribe-Data")[0] -PATH_TO_SCRIBE_DATA_SRC = f"{PATH_TO_SCRIBE_ORG}Scribe-Data/src" -sys.path.insert(0, PATH_TO_SCRIBE_DATA_SRC) - -from scribe_data.utils import ( # noqa: E402 +from scribe_data.utils import ( export_formatted_data, load_queried_data, map_genders, diff --git a/src/scribe_data/extract_transform/languages/Spanish/verbs/format_verbs.py b/src/scribe_data/extract_transform/languages/Spanish/verbs/format_verbs.py index e69d439df..ecfed6a8a 100644 --- a/src/scribe_data/extract_transform/languages/Spanish/verbs/format_verbs.py +++ b/src/scribe_data/extract_transform/languages/Spanish/verbs/format_verbs.py @@ -6,11 +6,7 @@ import os import sys -PATH_TO_SCRIBE_ORG = os.path.dirname(sys.path[0]).split("Scribe-Data")[0] -PATH_TO_SCRIBE_DATA_SRC = f"{PATH_TO_SCRIBE_ORG}Scribe-Data/src" -sys.path.insert(0, PATH_TO_SCRIBE_DATA_SRC) - -from scribe_data.utils import export_formatted_data, load_queried_data # noqa: E402 +from scribe_data.utils import export_formatted_data, load_queried_data file_path = sys.argv[0] diff --git a/src/scribe_data/extract_transform/languages/Swedish/nouns/format_nouns.py b/src/scribe_data/extract_transform/languages/Swedish/nouns/format_nouns.py index cf7170682..3e116e022 100644 --- a/src/scribe_data/extract_transform/languages/Swedish/nouns/format_nouns.py +++ b/src/scribe_data/extract_transform/languages/Swedish/nouns/format_nouns.py @@ -6,11 +6,7 @@ import os import sys -PATH_TO_SCRIBE_ORG = os.path.dirname(sys.path[0]).split("Scribe-Data")[0] -PATH_TO_SCRIBE_DATA_SRC = f"{PATH_TO_SCRIBE_ORG}Scribe-Data/src" -sys.path.insert(0, PATH_TO_SCRIBE_DATA_SRC) - -from scribe_data.utils import ( # noqa: E402 +from scribe_data.utils import ( export_formatted_data, load_queried_data, map_genders, diff --git a/src/scribe_data/extract_transform/languages/Swedish/translations/translate_words.py b/src/scribe_data/extract_transform/languages/Swedish/translations/translate_words.py index f960b5650..0bee8e50f 100644 --- a/src/scribe_data/extract_transform/languages/Swedish/translations/translate_words.py +++ b/src/scribe_data/extract_transform/languages/Swedish/translations/translate_words.py @@ -10,11 +10,7 @@ import os import sys -PATH_TO_SCRIBE_ORG = os.path.dirname(sys.path[0]).split("Scribe-Data")[0] -PATH_TO_SCRIBE_DATA_SRC = f"{PATH_TO_SCRIBE_ORG}Scribe-Data/src" -sys.path.insert(0, PATH_TO_SCRIBE_DATA_SRC) - -from scribe_data.utils import translate_to_other_languages # noqa: E402 +from scribe_data.utils import translate_to_other_languages SRC_LANG = "Swedish" translate_script_dir = os.path.dirname(os.path.abspath(__file__)) diff --git a/src/scribe_data/extract_transform/languages/Swedish/verbs/format_verbs.py b/src/scribe_data/extract_transform/languages/Swedish/verbs/format_verbs.py index c58b6de82..ed25a4733 100644 --- a/src/scribe_data/extract_transform/languages/Swedish/verbs/format_verbs.py +++ b/src/scribe_data/extract_transform/languages/Swedish/verbs/format_verbs.py @@ -6,11 +6,7 @@ import os import sys -PATH_TO_SCRIBE_ORG = os.path.dirname(sys.path[0]).split("Scribe-Data")[0] -PATH_TO_SCRIBE_DATA_SRC = f"{PATH_TO_SCRIBE_ORG}Scribe-Data/src" -sys.path.insert(0, PATH_TO_SCRIBE_DATA_SRC) - -from scribe_data.utils import export_formatted_data, load_queried_data # noqa: E402 +from scribe_data.utils import export_formatted_data, load_queried_data file_path = sys.argv[0] diff --git a/src/scribe_data/extract_transform/update_data.py b/src/scribe_data/extract_transform/update_data.py index 23d274459..f4e2976c7 100644 --- a/src/scribe_data/extract_transform/update_data.py +++ b/src/scribe_data/extract_transform/update_data.py @@ -24,11 +24,7 @@ from SPARQLWrapper import JSON, POST, SPARQLWrapper from tqdm.auto import tqdm -PATH_TO_SCRIBE_ORG = os.path.dirname(sys.path[0]).split("Scribe-Data")[0] -PATH_TO_SCRIBE_DATA_SRC = f"{PATH_TO_SCRIBE_ORG}Scribe-Data/src" -sys.path.insert(0, PATH_TO_SCRIBE_DATA_SRC) - -from scribe_data.utils import ( # noqa: E402 +from scribe_data.utils import ( check_and_return_command_line_args, ) diff --git a/src/scribe_data/extract_transform/update_words_to_translate.py b/src/scribe_data/extract_transform/update_words_to_translate.py index ab12a44d5..eff3ceb07 100644 --- a/src/scribe_data/extract_transform/update_words_to_translate.py +++ b/src/scribe_data/extract_transform/update_words_to_translate.py @@ -19,11 +19,7 @@ from SPARQLWrapper import JSON, POST, SPARQLWrapper from tqdm.auto import tqdm -PATH_TO_SCRIBE_ORG = os.path.dirname(sys.path[0]).split("Scribe-Data")[0] -PATH_TO_SCRIBE_DATA_SRC = f"{PATH_TO_SCRIBE_ORG}Scribe-Data/src" -sys.path.insert(0, PATH_TO_SCRIBE_DATA_SRC) - -from scribe_data.utils import ( # noqa: E402 +from scribe_data.utils import ( check_and_return_command_line_args, get_language_qid, get_scribe_languages, diff --git a/src/scribe_data/load/data_to_sqlite.py b/src/scribe_data/load/data_to_sqlite.py index 09cb2c344..f39c36538 100644 --- a/src/scribe_data/load/data_to_sqlite.py +++ b/src/scribe_data/load/data_to_sqlite.py @@ -19,11 +19,7 @@ from tqdm.auto import tqdm -PATH_TO_SCRIBE_ORG = os.path.dirname(sys.path[0]).split("Scribe-Data")[0] -PATH_TO_SCRIBE_DATA_SRC = f"{PATH_TO_SCRIBE_ORG}Scribe-Data/src" -sys.path.insert(0, PATH_TO_SCRIBE_DATA_SRC) - -from scribe_data.utils import get_language_iso # noqa: E402 +from scribe_data.utils import get_language_iso PATH_TO_ET_FILES = "../extract_transform/" diff --git a/src/scribe_data/load/send_dbs_to_scribe.py b/src/scribe_data/load/send_dbs_to_scribe.py index 082784c19..ad5f890ae 100644 --- a/src/scribe_data/load/send_dbs_to_scribe.py +++ b/src/scribe_data/load/send_dbs_to_scribe.py @@ -9,11 +9,7 @@ import os import sys -PATH_TO_SCRIBE_ORG = os.path.dirname(sys.path[0]).split("Scribe-Data")[0] -PATH_TO_SCRIBE_DATA_SRC = f"{PATH_TO_SCRIBE_ORG}Scribe-Data/src" -sys.path.insert(0, PATH_TO_SCRIBE_DATA_SRC) - -from scribe_data.utils import ( # noqa: E402 +from scribe_data.utils import ( get_ios_data_path, get_language_from_iso, get_path_from_load_dir, diff --git a/src/scribe_data/utils.py b/src/scribe_data/utils.py index 303cb1afb..1f6336c34 100644 --- a/src/scribe_data/utils.py +++ b/src/scribe_data/utils.py @@ -63,12 +63,12 @@ def _load_json(package_path: str, file_name: str, root: str): A python entity starting at 'root'. """ # Add 'Scribe-Data/src' to PYTHONPATH so that resources.files() can find 'package_path'. - parts = Path(__file__).resolve().parts - prj_root_idx = parts.index(PROJECT_ROOT) - package_root = str(Path(*parts[: prj_root_idx + 1], "src")) + # parts = Path(__file__).resolve().parts + # prj_root_idx = parts.index(PROJECT_ROOT) + # package_root = str(Path(*parts[: prj_root_idx + 1], "src")) - if package_root not in sys.path: - sys.path.insert(0, package_root) + # if package_root not in sys.path: + # sys.path.insert(0, package_root) with resources.files(package_path).joinpath(file_name).open( encoding="utf-8" From 8a37f3567c53957a7bb8e3bbe8d2f598b98c13d8 Mon Sep 17 00:00:00 2001 From: Shashank Mittal Date: Mon, 25 Mar 2024 04:56:41 +0530 Subject: [PATCH 2/4] remove unnecessary imports Signed-off-by: Shashank Mittal --- .../languages/English/translations/translate_words.py | 1 - .../languages/French/translations/translate_words.py | 1 - .../languages/German/translations/translate_words.py | 1 - .../languages/Portuguese/translations/translate_words.py | 1 - .../languages/Russian/translations/translate_words.py | 1 - .../languages/Swedish/translations/translate_words.py | 1 - .../extract_transform/update_words_to_translate.py | 1 - src/scribe_data/load/send_dbs_to_scribe.py | 1 - src/scribe_data/utils.py | 8 -------- 9 files changed, 16 deletions(-) diff --git a/src/scribe_data/extract_transform/languages/English/translations/translate_words.py b/src/scribe_data/extract_transform/languages/English/translations/translate_words.py index a8aee55c4..22e641961 100644 --- a/src/scribe_data/extract_transform/languages/English/translations/translate_words.py +++ b/src/scribe_data/extract_transform/languages/English/translations/translate_words.py @@ -8,7 +8,6 @@ import json import os -import sys from scribe_data.utils import translate_to_other_languages diff --git a/src/scribe_data/extract_transform/languages/French/translations/translate_words.py b/src/scribe_data/extract_transform/languages/French/translations/translate_words.py index 5100406ce..f753d5765 100644 --- a/src/scribe_data/extract_transform/languages/French/translations/translate_words.py +++ b/src/scribe_data/extract_transform/languages/French/translations/translate_words.py @@ -8,7 +8,6 @@ import json import os -import sys from scribe_data.utils import translate_to_other_languages diff --git a/src/scribe_data/extract_transform/languages/German/translations/translate_words.py b/src/scribe_data/extract_transform/languages/German/translations/translate_words.py index 2abe27147..121b96044 100644 --- a/src/scribe_data/extract_transform/languages/German/translations/translate_words.py +++ b/src/scribe_data/extract_transform/languages/German/translations/translate_words.py @@ -8,7 +8,6 @@ import json import os -import sys from scribe_data.utils import translate_to_other_languages diff --git a/src/scribe_data/extract_transform/languages/Portuguese/translations/translate_words.py b/src/scribe_data/extract_transform/languages/Portuguese/translations/translate_words.py index d25ff2b65..4885ca522 100644 --- a/src/scribe_data/extract_transform/languages/Portuguese/translations/translate_words.py +++ b/src/scribe_data/extract_transform/languages/Portuguese/translations/translate_words.py @@ -8,7 +8,6 @@ import json import os -import sys from scribe_data.utils import translate_to_other_languages diff --git a/src/scribe_data/extract_transform/languages/Russian/translations/translate_words.py b/src/scribe_data/extract_transform/languages/Russian/translations/translate_words.py index 56542ed9e..e49076c7b 100644 --- a/src/scribe_data/extract_transform/languages/Russian/translations/translate_words.py +++ b/src/scribe_data/extract_transform/languages/Russian/translations/translate_words.py @@ -8,7 +8,6 @@ import json import os -import sys from scribe_data.utils import translate_to_other_languages diff --git a/src/scribe_data/extract_transform/languages/Swedish/translations/translate_words.py b/src/scribe_data/extract_transform/languages/Swedish/translations/translate_words.py index 0bee8e50f..f4f483478 100644 --- a/src/scribe_data/extract_transform/languages/Swedish/translations/translate_words.py +++ b/src/scribe_data/extract_transform/languages/Swedish/translations/translate_words.py @@ -8,7 +8,6 @@ import json import os -import sys from scribe_data.utils import translate_to_other_languages diff --git a/src/scribe_data/extract_transform/update_words_to_translate.py b/src/scribe_data/extract_transform/update_words_to_translate.py index eff3ceb07..7679c100a 100644 --- a/src/scribe_data/extract_transform/update_words_to_translate.py +++ b/src/scribe_data/extract_transform/update_words_to_translate.py @@ -12,7 +12,6 @@ """ import json -import os import sys import urllib diff --git a/src/scribe_data/load/send_dbs_to_scribe.py b/src/scribe_data/load/send_dbs_to_scribe.py index ad5f890ae..8f1a52690 100644 --- a/src/scribe_data/load/send_dbs_to_scribe.py +++ b/src/scribe_data/load/send_dbs_to_scribe.py @@ -7,7 +7,6 @@ """ import os -import sys from scribe_data.utils import ( get_ios_data_path, diff --git a/src/scribe_data/utils.py b/src/scribe_data/utils.py index 1f6336c34..ca1cda9af 100644 --- a/src/scribe_data/utils.py +++ b/src/scribe_data/utils.py @@ -33,7 +33,6 @@ import signal import sys from importlib import resources -from pathlib import Path from typing import Any import langcodes @@ -62,13 +61,6 @@ def _load_json(package_path: str, file_name: str, root: str): ------- A python entity starting at 'root'. """ - # Add 'Scribe-Data/src' to PYTHONPATH so that resources.files() can find 'package_path'. - # parts = Path(__file__).resolve().parts - # prj_root_idx = parts.index(PROJECT_ROOT) - # package_root = str(Path(*parts[: prj_root_idx + 1], "src")) - - # if package_root not in sys.path: - # sys.path.insert(0, package_root) with resources.files(package_path).joinpath(file_name).open( encoding="utf-8" From 4954e17a37b132d9600dcefe353ba63a2cd7cb44 Mon Sep 17 00:00:00 2001 From: Shashank Mittal Date: Mon, 25 Mar 2024 05:06:43 +0530 Subject: [PATCH 3/4] ruff check Signed-off-by: Shashank Mittal --- .../languages/English/translations/translate_words.py | 2 +- .../languages/French/translations/translate_words.py | 2 +- .../languages/German/translations/translate_words.py | 2 +- .../languages/Italian/translations/translate_words.py | 7 +------ .../languages/Portuguese/translations/translate_words.py | 2 +- .../languages/Russian/translations/translate_words.py | 2 +- .../languages/Spanish/translations/translate_words.py | 7 +------ .../languages/Swedish/translations/translate_words.py | 2 +- .../extract_transform/translation/translation_utils.py | 8 +------- 9 files changed, 9 insertions(+), 25 deletions(-) diff --git a/src/scribe_data/extract_transform/languages/English/translations/translate_words.py b/src/scribe_data/extract_transform/languages/English/translations/translate_words.py index b861c6aa9..60327272e 100644 --- a/src/scribe_data/extract_transform/languages/English/translations/translate_words.py +++ b/src/scribe_data/extract_transform/languages/English/translations/translate_words.py @@ -9,7 +9,7 @@ import json import os -from scribe_data.extract_transform.translation.translation_utils import ( # noqa: E402 +from scribe_data.extract_transform.translation.translation_utils import ( translate_to_other_languages, ) diff --git a/src/scribe_data/extract_transform/languages/French/translations/translate_words.py b/src/scribe_data/extract_transform/languages/French/translations/translate_words.py index aefcf3490..9d70cec40 100644 --- a/src/scribe_data/extract_transform/languages/French/translations/translate_words.py +++ b/src/scribe_data/extract_transform/languages/French/translations/translate_words.py @@ -9,7 +9,7 @@ import json import os -from scribe_data.extract_transform.translation.translation_utils import ( # noqa: E402 +from scribe_data.extract_transform.translation.translation_utils import ( translate_to_other_languages, ) diff --git a/src/scribe_data/extract_transform/languages/German/translations/translate_words.py b/src/scribe_data/extract_transform/languages/German/translations/translate_words.py index 131360a3c..47f6656f7 100644 --- a/src/scribe_data/extract_transform/languages/German/translations/translate_words.py +++ b/src/scribe_data/extract_transform/languages/German/translations/translate_words.py @@ -9,7 +9,7 @@ import json import os -from scribe_data.extract_transform.translation.translation_utils import ( # noqa: E402 +from scribe_data.extract_transform.translation.translation_utils import ( translate_to_other_languages, ) diff --git a/src/scribe_data/extract_transform/languages/Italian/translations/translate_words.py b/src/scribe_data/extract_transform/languages/Italian/translations/translate_words.py index 832db0263..79a7a6e7d 100644 --- a/src/scribe_data/extract_transform/languages/Italian/translations/translate_words.py +++ b/src/scribe_data/extract_transform/languages/Italian/translations/translate_words.py @@ -8,13 +8,8 @@ import json import os -import sys -PATH_TO_SCRIBE_ORG = os.path.dirname(sys.path[0]).split("Scribe-Data")[0] -PATH_TO_SCRIBE_DATA_SRC = f"{PATH_TO_SCRIBE_ORG}Scribe-Data/src" -sys.path.insert(0, PATH_TO_SCRIBE_DATA_SRC) - -from scribe_data.extract_transform.translation.translation_utils import ( # noqa: E402 +from scribe_data.extract_transform.translation.translation_utils import ( translate_to_other_languages, ) diff --git a/src/scribe_data/extract_transform/languages/Portuguese/translations/translate_words.py b/src/scribe_data/extract_transform/languages/Portuguese/translations/translate_words.py index 329b66d96..00e68aa0e 100644 --- a/src/scribe_data/extract_transform/languages/Portuguese/translations/translate_words.py +++ b/src/scribe_data/extract_transform/languages/Portuguese/translations/translate_words.py @@ -9,7 +9,7 @@ import json import os -from scribe_data.extract_transform.translation.translation_utils import ( # noqa: E402 +from scribe_data.extract_transform.translation.translation_utils import ( translate_to_other_languages, ) diff --git a/src/scribe_data/extract_transform/languages/Russian/translations/translate_words.py b/src/scribe_data/extract_transform/languages/Russian/translations/translate_words.py index 8e3ae632b..4118a90e2 100644 --- a/src/scribe_data/extract_transform/languages/Russian/translations/translate_words.py +++ b/src/scribe_data/extract_transform/languages/Russian/translations/translate_words.py @@ -9,7 +9,7 @@ import json import os -from scribe_data.extract_transform.translation.translation_utils import ( # noqa: E402 +from scribe_data.extract_transform.translation.translation_utils import ( translate_to_other_languages, ) diff --git a/src/scribe_data/extract_transform/languages/Spanish/translations/translate_words.py b/src/scribe_data/extract_transform/languages/Spanish/translations/translate_words.py index 2d6c172f2..3ee4b4960 100644 --- a/src/scribe_data/extract_transform/languages/Spanish/translations/translate_words.py +++ b/src/scribe_data/extract_transform/languages/Spanish/translations/translate_words.py @@ -8,13 +8,8 @@ import json import os -import sys -PATH_TO_SCRIBE_ORG = os.path.dirname(sys.path[0]).split("Scribe-Data")[0] -PATH_TO_SCRIBE_DATA_SRC = f"{PATH_TO_SCRIBE_ORG}Scribe-Data/src" -sys.path.insert(0, PATH_TO_SCRIBE_DATA_SRC) - -from scribe_data.extract_transform.translation.translation_utils import ( # noqa: E402 +from scribe_data.extract_transform.translation.translation_utils import ( translate_to_other_languages, ) diff --git a/src/scribe_data/extract_transform/languages/Swedish/translations/translate_words.py b/src/scribe_data/extract_transform/languages/Swedish/translations/translate_words.py index 73558bb41..a3ebe1572 100644 --- a/src/scribe_data/extract_transform/languages/Swedish/translations/translate_words.py +++ b/src/scribe_data/extract_transform/languages/Swedish/translations/translate_words.py @@ -9,7 +9,7 @@ import json import os -from scribe_data.extract_transform.translation.translation_utils import ( # noqa: E402 +from scribe_data.extract_transform.translation.translation_utils import ( translate_to_other_languages, ) diff --git a/src/scribe_data/extract_transform/translation/translation_utils.py b/src/scribe_data/extract_transform/translation/translation_utils.py index 380474795..557d5c6fb 100644 --- a/src/scribe_data/extract_transform/translation/translation_utils.py +++ b/src/scribe_data/extract_transform/translation/translation_utils.py @@ -7,17 +7,11 @@ """ import json -import os import signal -import sys from transformers import M2M100ForConditionalGeneration, M2M100Tokenizer -PATH_TO_SCRIBE_ORG = os.path.dirname(sys.path[0]).split("Scribe-Data")[0] -PATH_TO_SCRIBE_DATA_SRC = f"{PATH_TO_SCRIBE_ORG}Scribe-Data/src" -sys.path.insert(0, PATH_TO_SCRIBE_DATA_SRC) - -from scribe_data.utils import ( # noqa: E402 +from scribe_data.utils import ( get_language_dir_path, get_language_iso, get_target_langcodes, From 272b77c60867ee46ff21cfbd0c65dc383f5cf752 Mon Sep 17 00:00:00 2001 From: Andrew Tavis McAllister Date: Fri, 29 Mar 2024 18:06:36 +0100 Subject: [PATCH 4/4] #122 update docs with directions to pip install the local version --- CONTRIBUTING.md | 1 + README.md | 1 + docs/source/_static/CONTRIBUTING.rst | 1 + 3 files changed, 3 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cd63eba00..0aecd9c09 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -139,6 +139,7 @@ After activating the virtual environment, install the required dependencies by r ```bash pip install --upgrade pip # make sure that pip is at the latest version pip install -r requirements.txt # install dependencies +pip install -e . # install the local version of Scribe-Data ``` > [!NOTE] diff --git a/README.md b/README.md index feda2101f..2b8cc53ed 100644 --- a/README.md +++ b/README.md @@ -159,6 +159,7 @@ After activating the virtual environment, install the required dependencies by r ```bash pip install --upgrade pip # make sure that pip is at the latest version pip install -r requirements.txt # install dependencies +pip install -e . # install the local version of Scribe-Data ``` > [!NOTE] diff --git a/docs/source/_static/CONTRIBUTING.rst b/docs/source/_static/CONTRIBUTING.rst index b4800bfcc..4a34e1ffc 100644 --- a/docs/source/_static/CONTRIBUTING.rst +++ b/docs/source/_static/CONTRIBUTING.rst @@ -129,6 +129,7 @@ GitHub also has documentation on how to `Generate a new SSH key