refacto(cleanup): fix some type hints and relative imports (#540)

qgis-deployment · Aug 30, 2024 · 240d9f2 · 240d9f2
1 parent e0e5a80
commit 240d9f2
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 21 deletions.
diff --git a/qgis_deployment_toolbelt/__init__.py b/qgis_deployment_toolbelt/__init__.py
@@ -1,4 +0,0 @@
-#! python3  # noqa: E265
-
-# submodules
-from .__about__ import __version__  # noqa: F401

diff --git a/qgis_deployment_toolbelt/cli.py b/qgis_deployment_toolbelt/cli.py
@@ -32,10 +32,6 @@
 from qgis_deployment_toolbelt.commands.upgrade import parser_upgrade
 from qgis_deployment_toolbelt.utils.journalizer import configure_logger
 
-# #############################################################################
-# ########## Globals ###############
-# ##################################
-
 # ############################################################################
 # ########## FUNCTIONS ###########
 # ################################
@@ -84,7 +80,7 @@ def add_common_arguments(
 def set_default_subparser(
     parser_to_update: argparse.ArgumentParser,
     default_subparser_name: str,
-    args: list = None,
+    args: list | None = None,
 ):
     """Set a default subparser to a parent parser. Call after setup and just before
         parse_args().

diff --git a/qgis_deployment_toolbelt/utils/__init__.py b/qgis_deployment_toolbelt/utils/__init__.py
@@ -1,7 +0,0 @@
-#! python3  # noqa: E265
-
-"""Common tools and helpers."""
-
-# submodules
-from .proxies import get_proxy_settings  # noqa: E402 F401
-from .str2bool import str2bool  # noqa: E402 F401

diff --git a/qgis_deployment_toolbelt/utils/journalizer.py b/qgis_deployment_toolbelt/utils/journalizer.py
@@ -43,7 +43,7 @@
 # ################################
 
 
-def configure_logger(verbosity: int = 1, logfile: Path = None):
+def configure_logger(verbosity: int = 1, logfile: None | Path | str = None):
     """Configure logging according to verbosity from CLI.
 
     Args:
@@ -169,5 +169,5 @@ def get_logger_filepath() -> Path | None:
             if hasattr(handler, "baseFilename"):
                 return Path(handler.baseFilename)
 
-    logger.warning("No file found in ay log handlers.")
+    logger.warning("No file found in any log handlers.")
     return None
diff --git a/tests/test_job_environment_variables.py b/tests/test_job_environment_variables.py
@@ -26,7 +26,7 @@
 from qgis_deployment_toolbelt.jobs.job_environment_variables import (
     JobEnvironmentVariables,
 )
-from qgis_deployment_toolbelt.utils import str2bool
+from qgis_deployment_toolbelt.utils.str2bool import str2bool
 
 # 3rd party
 

diff --git a/tests/test_utils_proxies.py b/tests/test_utils_proxies.py
@@ -15,7 +15,7 @@
 from os import environ
 
 # project
-from qgis_deployment_toolbelt.utils import get_proxy_settings
+from qgis_deployment_toolbelt.utils.proxies import get_proxy_settings
 
 # ############################################################################
 # ########## Classes #############

diff --git a/tests/test_utils_str2bool.py b/tests/test_utils_str2bool.py
@@ -14,7 +14,7 @@
 import unittest
 
 # project
-from qgis_deployment_toolbelt.utils import str2bool
+from qgis_deployment_toolbelt.utils.str2bool import str2bool
 
 # ############################################################################
 # ########## Classes #############