diff --git a/CHANGELOG.md b/CHANGELOG.md index fb3d5f90..53c3c7d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,11 @@ Emojis for the following are chosen based on [gitmoji](https://gitmoji.dev/). - The user is prompted to download a dump for calls for all data ([#518](https://github.com/scribe-org/Scribe-Data/issues/518)). - Scribe-Data must now use a lexeme dump to download all Wikidata lexeme data ([#519](https://github.com/scribe-org/Scribe-Data/issues/519)). +### 🐞 Bug Fixes + +- The version command was fixed to account for cases where the version has a `v` before it ([#534](https://github.com/scribe-org/Scribe-Data/issues/534)). +- The functionality to check for current data and prompt its deletion was centralized and messages to the user were made more clear ([#336](https://github.com/scribe-org/Scribe-Data/issues/336)). + ## Scribe-Data 4.1.0 ### ✨ Features diff --git a/src/scribe_data/cli/interactive.py b/src/scribe_data/cli/interactive.py index 8cfea57c..7a0beb2d 100644 --- a/src/scribe_data/cli/interactive.py +++ b/src/scribe_data/cli/interactive.py @@ -37,7 +37,7 @@ # from scribe_data.cli.list import list_wrapper from scribe_data.cli.get import get_data from scribe_data.cli.total import total_wrapper -from scribe_data.cli.version import get_version_message +from scribe_data.cli.version import get_local_version from scribe_data.wikidata.wikidata_utils import parse_wd_lexeme_dump from scribe_data.utils import ( DEFAULT_JSON_EXPORT_DIR, @@ -331,9 +331,7 @@ def start_interactive_mode(operation: str = None): operation : str The type of operation that interactive mode is being ran with. """ - rprint( - f"[bold cyan]Welcome to {get_version_message()} interactive mode![/bold cyan]" - ) + rprint(f"[bold cyan]Welcome to {get_local_version()} interactive mode![/bold cyan]") while True: # Check if both selected_languages and selected_data_types are empty. if not config.selected_languages and not config.selected_data_types: diff --git a/src/scribe_data/cli/main.py b/src/scribe_data/cli/main.py index f696b238..5a4818f2 100644 --- a/src/scribe_data/cli/main.py +++ b/src/scribe_data/cli/main.py @@ -55,11 +55,12 @@ def main() -> None: formatter_class=lambda prog: argparse.HelpFormatter(prog, max_help_position=60), ) subparsers = parser.add_subparsers(dest="command") + parser.add_argument( "-v", "--version", action="version", - version=f"{get_version_message()}", + version=get_version_message(), help="Show the version of the Scribe-Data CLI.", )