From 6ddfcccc2c1627062d42418fd1094483056b5ac0 Mon Sep 17 00:00:00 2001
From: "Julien M." <julien.moura@oslandia.com>
Date: Wed, 20 Mar 2024 19:05:02 +0100
Subject: [PATCH] refacto: make naming more consistent

---
 dicogis/cli/main.py | 8 ++++----
 dicogis/ui/main.py  | 6 +++---
 setup.py            | 9 +++++----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/dicogis/cli/main.py b/dicogis/cli/main.py
index 6701f1f6..9de12ca6 100644
--- a/dicogis/cli/main.py
+++ b/dicogis/cli/main.py
@@ -19,7 +19,7 @@
 # ########## Globals ###############
 # ##################################
 
-cli_dicogis = typer.Typer()
+dicogis_cli = typer.Typer()
 state = {"verbose": False}
 APP_NAME = __title__
 logger = logging.getLogger(__name__)
@@ -43,7 +43,7 @@ def version_callback(value: bool):
         raise typer.Exit()
 
 
-@cli_dicogis.callback()
+@dicogis_cli.callback()
 def main(
     verbose: Annotated[
         bool,
@@ -76,7 +76,7 @@ def main(
 
 
 # integrate subcommands
-cli_dicogis.add_typer(cli_list, name="list")
+dicogis_cli.add_typer(cli_list, name="list")
 
 
 # ############################################################################
@@ -84,4 +84,4 @@ def main(
 # #################################
 if __name__ == "__main__":
     """standalone execution"""
-    cli_dicogis()
+    dicogis_cli()
diff --git a/dicogis/ui/main.py b/dicogis/ui/main.py
index 956bd34b..97dfddf9 100644
--- a/dicogis/ui/main.py
+++ b/dicogis/ui/main.py
@@ -39,9 +39,9 @@
 # ##################################
 
 
-def main_gui_launcher():
+def dicogis_gui():
+    """Launch DicoGIS GUI."""
     # LOG
-
     logging.captureWarnings(True)
     logger.setLevel(logging.DEBUG)  # all errors will be get
     log_form = logging.Formatter(
@@ -105,4 +105,4 @@ def main_gui_launcher():
 
 if __name__ == "__main__":
     """standalone execution"""
-    main_gui_launcher()
+    dicogis_gui()
diff --git a/setup.py b/setup.py
index 6cfa84ef..9ae5d215 100644
--- a/setup.py
+++ b/setup.py
@@ -80,7 +80,7 @@ def load_requirements(requirements_files: Path | list[Path]) -> list:
     ),
     include_package_data=True,
     # dependencies
-    python_requires=">=3.9, <4",
+    python_requires=">=3.10, <4",
     extras_require={
         "dev": load_requirements(HERE / "requirements/development.txt"),
         "doc": load_requirements(HERE / "requirements/documentation.txt"),
@@ -91,10 +91,10 @@ def load_requirements(requirements_files: Path | list[Path]) -> list:
     # run
     entry_points={
         "console_scripts": [
-            f"{__about__.__package_name__}-cli = dicogis.cli.main:cli_dicogis"
+            f"{__about__.__package_name__}-cli = dicogis.cli.main:dicogis_cli"
         ],
         "gui_scripts": [
-            f"{__about__.__package_name__}-gui = dicogis.ui.main:main_gui_launcher",
+            f"{__about__.__package_name__}-gui = dicogis.ui.main:dicogis_gui",
         ],
     },
     # metadata
@@ -103,15 +103,16 @@ def load_requirements(requirements_files: Path | list[Path]) -> list:
         "Intended Audience :: End Users/Desktop",
         "Intended Audience :: Information Technology",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
         "Programming Language :: Python :: Implementation :: CPython",
         "Development Status :: 5 - Production/Stable",
         "Environment :: Win32 (MS Windows)",
         "License :: OSI Approved :: Apache Software License 2.0",
         "Operating System :: OS Independent",
         "Operating System :: Microsoft :: Windows :: Windows 10",
+        "Operating System :: Microsoft :: Windows :: Windows 11",
         "Topic :: Scientific/Engineering :: GIS",
     ],
 )