drawlib 0.1.32__tar.gz → 0.1.33.dev1__tar.gz

{drawlib-0.1.32 → drawlib-0.1.33.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: drawlib
-Version: 0.1.32
+Version: 0.1.33.dev1
 Summary: Python drawing library. Illustration as Code.
 Home-page: https://www.drawlib.com
 Author: Yuichi Ito

{drawlib-0.1.32 → drawlib-0.1.33.dev1}/drawlib/__init__.py

@@ -12,7 +12,7 @@
 from typing import Final
 
 # please update here when you release new version
-VERSION = "0.1.32"
+VERSION = "0.1.33.dev1"
 
 # might not be changed
 LIB_NAME: Final[str] = "drawlib"

{drawlib-0.1.32 → drawlib-0.1.33.dev1}/drawlib/__main__.py

@@ -14,7 +14,6 @@ from drawlib.v0_1.private.command import call
 
 def main() -> None:
     """Call latest drawlib command"""
-
     call()
 
 

{drawlib-0.1.32 → drawlib-0.1.33.dev1}/drawlib/apis.py

@@ -7,7 +7,7 @@
 # express or implied, including but not limited to the warranties of
 # merchantability, fitness for a particular purpose and noninfringement.
 
-# pylint: disable=unused-wildcard-import, wildcard-import
+# ruff: noqa: F403
 
 """Latest API module."""
 

{drawlib-0.1.32 → drawlib-0.1.33.dev1}/drawlib/v0_1/__init__.py

@@ -10,6 +10,7 @@
 """Root package of API v0.1"""
 
 from typing import Final
+
 import drawlib
 
 # this API package is latest now. So, API version is same to software's one.

{drawlib-0.1.32 → drawlib-0.1.33.dev1}/drawlib/v0_1/apis.py

@@ -9,38 +9,26 @@
 
 """API v0.1 module."""
 
-# pylint: disable=unused-import
-
-#############
-### Class ###
-#############
+# ruff: noqa: F401
 
 from drawlib.v0_1.private.core.colors import (
     Colors,
     Colors140,
+    ColorsBase,
     ColorsThemeDefault,
     ColorsThemeEssentials,
     ColorsThemeMonochrome,
-    # ColorsThemeFlatUI,
-    ColorsBase,
 )
-
-from drawlib.v0_1.private.core.model import (
-    IconStyle,
-    ImageStyle,
-    LineStyle,
-    ShapeStyle,
-    ShapeTextStyle,
-    TextStyle,
+from drawlib.v0_1.private.core.dimage import (
+    Dimage,
 )
-
 from drawlib.v0_1.private.core.fonts import (
-    FontFile,
     # fonts
     Font,
     FontArabic,
     FontBrahmic,
     FontChinese,
+    FontFile,
     FontJapanese,
     FontKorean,
     FontMonoSpace,
@@ -50,84 +38,70 @@ from drawlib.v0_1.private.core.fonts import (
     FontSourceCode,
     FontThai,
 )
-
-from drawlib.v0_1.private.core.dimage import (
-    Dimage,
+from drawlib.v0_1.private.core.model import (
+    IconStyle,
+    ImageStyle,
+    LineStyle,
+    ShapeStyle,
+    ShapeTextStyle,
+    TextStyle,
+)
+from drawlib.v0_1.private.core.theme import (
+    dtheme,
 )
-
-######################
-### Canvas Methods ###
-######################
-
 from drawlib.v0_1.private.core_canvas.canvas import (
+    # shape patches
+    arc,
+    # shape original
+    arrow,
+    chevron,
+    circle,
     # base
     clear,
     config,
-    shape,
+    donuts,
+    ellipse,
+    fan,
     # image
     image,
     # line
     line,
-    line_curved,
     line_bezier1,
     line_bezier2,
+    line_curved,
     lines,
-    lines_curved,
     lines_bezier,
-    # shape patches
-    arc,
-    circle,
-    ellipse,
+    lines_curved,
+    parallelogram,
     polygon,
     rectangle,
     regularpolygon,
-    wedge,
-    donuts,
-    fan,
-    # shape original
-    arrow,
     rhombus,
-    parallelogram,
-    trapezoid,
-    triangle,
+    # canvas
+    save,
+    shape,
     star,
-    chevron,
     # text
     text,
     text_vertical,
-    # canvas
-    save,
+    trapezoid,
+    triangle,
+    wedge,
 )
-
-
-from drawlib.v0_1.private.icons.util import (
-    icon,
+from drawlib.v0_1.private.dutil import (
+    dutil_canvas,
+    dutil_color,
+    dutil_script,
+)
+from drawlib.v0_1.private.dutil.settings import (
+    dutil_settings,
 )
-
 from drawlib.v0_1.private.icons import (
     phosphor as icon_phosphor,
 )
-
-######################
-### Other Drawings ###
-######################
-
-from drawlib.v0_1.private.core.theme import (
-    dtheme,
+from drawlib.v0_1.private.icons.util import (
+    icon,
 )
 from drawlib.v0_1.private.smartarts import (
     dsart,
 )
-
-#################
-### Utilities ###
-#################
-
-from drawlib.v0_1.private.dutil import (
-    dutil_script,
-    dutil_canvas,
-    dutil_color,
-)
-from drawlib.v0_1.private.dutil.settings import (
-    dutil_settings,
-)

{drawlib-0.1.32 → drawlib-0.1.33.dev1}/drawlib/v0_1/private/command.py

@@ -7,28 +7,28 @@
 # express or implied, including but not limited to the warranties of
 # merchantability, fitness for a particular purpose and noninfringement.
 
-# pylint: disable=logging-fstring-interpolation, too-few-public-methods
+# type: ignore
 
 """Implementation of drawlib command."""
 
-import os
-import sys
 import argparse
-from typing import Optional, List, Literal, Tuple
 import importlib.util
+import os
+import sys
 import traceback
+from typing import List, Literal, Optional, Tuple
 
 import drawlib
 import drawlib.v0_1
-from drawlib.v0_1.private.logging import logger
+from drawlib.v0_1.private.core_canvas.canvas import clear
+from drawlib.v0_1.private.dutil.dutil_canvas import initialize
 from drawlib.v0_1.private.dutil.settings import dutil_settings
+from drawlib.v0_1.private.logging import logger
 from drawlib.v0_1.private.util import (
     error_handler,
     get_script_relative_path,
     purge_font_cache,
 )
-from drawlib.v0_1.private.core_canvas.canvas import clear
-from drawlib.v0_1.private.dutil.dutil_canvas import initialize
 
 
 def call() -> None:
@@ -42,7 +42,6 @@ def call() -> None:
     Raises:
         ValueError: If an invalid logging mode is specified.
     """
-
     argparser = DrawlibArgParser()
     argparser.parse()
 
@@ -117,7 +116,6 @@ class DrawlibArgParser:
         Returns:
             None
         """
-
         parser = argparse.ArgumentParser(
             description="Ilustration as code by python",
         )
@@ -191,7 +189,6 @@ class DrawlibArgParser:
         Returns:
             None
         """
-
         # special options
         self._name_args, _ = self._parser.parse_known_args()
 
@@ -209,9 +206,9 @@ class DrawlibArgParser:
             bool: True if version option is specified, False otherwise.
 
         """
-
         if self._name_args is None:
             self.parse()
+
         return self._name_args.version
 
     def is_purge_font_cache(self) -> bool:
@@ -224,9 +221,9 @@ class DrawlibArgParser:
             bool: True if purge font cache option is specified, False otherwise.
 
         """
-
         if self._name_args is None:
             self.parse()
+
         return self._name_args.purge_font_cache
 
     def get_logging_mode(self) -> Literal["quiet", "normal", "verbose", "developer"]:
@@ -243,7 +240,6 @@ class DrawlibArgParser:
         Returns:
             Literal["quiet", "normal", "verbose", "developer"]: Logging mode.
         """
-
         if self._name_args is None:
             self.parse()
 
@@ -274,7 +270,6 @@ class DrawlibArgParser:
         Returns:
             Literal["none", "auto_clear", "auto_initialize"]: Execution mode.
         """
-
         if self._name_args is None:
             self.parse()
 
@@ -295,7 +290,6 @@ class DrawlibArgParser:
         Returns:
             List[str]: List of positional arguments (files and directories).
         """
-
         if self._positional_args is None:
             self.parse()
 
@@ -324,8 +318,7 @@ class DrawlibExecuter:
         Raises:
             ValueError: If mode is not one of ["none", "auto_clear", "auto_initialize"].
         """
-
-        if mode not in ["none", "auto_clear", "auto_initialize"]:
+        if mode not in {"none", "auto_clear", "auto_initialize"}:
             raise ValueError(f'Arg mode is "{mode}". But it must be one of ["none", "auto_clear", "auto_initialize"].')
         self._mode = mode
         self._topdir_path: str = ""
@@ -350,7 +343,6 @@ class DrawlibExecuter:
             ValueError: If the specified path `file_or_directory` does not exist.
 
         """
-
         path = get_script_relative_path(file_or_directory)
         if not os.path.exists(path):
             raise ValueError(f'"{path}" does not exist')
@@ -383,7 +375,6 @@ class DrawlibExecuter:
             ValueError: If the specified directory does not have __init__.py, indicating it's not a valid package.
 
         """
-
         if os.path.isfile(path):
             topdir = os.path.dirname(path)
         else:
@@ -407,7 +398,8 @@ class DrawlibExecuter:
             logger.info(f'    - Parent of package directory "{topdir}" is already in Python Path.')
         logger.info("")
 
-    def _get_python_files(self, directory: str) -> List[str]:
+    @staticmethod
+    def _get_python_files(directory: str) -> List[str]:
         """Retrieve all Python files recursively within the specified directory.
 
         Recursively searches the specified directory for Python files (*.py) and returns a sorted list
@@ -419,7 +411,6 @@ class DrawlibExecuter:
         Returns:
             List[str]: Sorted list of paths to Python files found within the directory.
         """
-
         python_files: List[str] = []
         for root, _, files in os.walk(directory):
             for file in files:
@@ -447,7 +438,6 @@ class DrawlibExecuter:
         Returns:
             None
         """
-
         words = self._get_package_words(file_path)
         self._load_parent_modules(words)
 
@@ -479,7 +469,7 @@ class DrawlibExecuter:
             mspec.loader.exec_module(module)  # type: ignore[union-attr]
             sys.modules[name] = module
 
-        except Exception as e:  # pylint: disable=broad-exception-caught
+        except Exception as e:
             # Please don't raise again.
             # Error handler can't detect exact error location of imported module
             file, line, _, _ = traceback.extract_tb(e.__traceback__)[-1]
@@ -489,7 +479,8 @@ class DrawlibExecuter:
             logger.debug(traceback.format_exc())
             sys.exit(1)
 
-    def _is_module_loaded(self, module_path: str) -> bool:
+    @staticmethod
+    def _is_module_loaded(module_path: str) -> bool:
         """Check if the specified module is already loaded.
 
         Checks if the module specified by `module_path` is already loaded in the Python environment.
@@ -500,7 +491,6 @@ class DrawlibExecuter:
         Returns:
             bool: True if the module is already loaded, False otherwise.
         """
-
         # Normalize the module path to ensure consistent comparison
         module_path = os.path.abspath(module_path)
 
@@ -518,7 +508,7 @@ class DrawlibExecuter:
 
         return False
 
-    def _get_package_words(self, file_path):
+    def _get_package_words(self, file_path: str) -> List[str]:
         """Retrieve the package words from the specified file path relative to the top directory.
 
         Determines the hierarchical package structure of the specified `file_path` relative to the
@@ -530,7 +520,6 @@ class DrawlibExecuter:
         Returns:
             List[str]: List of words representing the package structure.
         """
-
         last_path = file_path.replace(self._topdir_path, "")
         words = last_path.split(os.sep)
         if words[0] == "":
@@ -552,7 +541,6 @@ class DrawlibExecuter:
         Raises:
             ValueError: If any parent module directory does not have __init__.py, indicating it's not a valid package.
         """
-
         for i in range(1, len(words)):
             name = ".".join(words[:i])
             if name in sys.modules:

{drawlib-0.1.32 → drawlib-0.1.33.dev1}/drawlib/v0_1/private/core/colors.py

@@ -7,15 +7,13 @@
 # express or implied, including but not limited to the warranties of
 # merchantability, fitness for a particular purpose and noninfringement.
 
-# pylint: disable=invalid-name, too-few-public-methods
-
 """Color definition module."""
 
 from typing import Final, Tuple
 
 
 class ColorsBase:
-    """Base class for color-related classes, providing common attributes"""
+    """Base class for color-related classes, providing common attributes."""
 
     Transparent: Final[Tuple[int, int, int, float]] = (0, 0, 0, 0.0)