diff --git a/pyufunc/__init.py b/pyufunc/__init.py index ddc56e0..a34c131 100644 --- a/pyufunc/__init.py +++ b/pyufunc/__init.py @@ -9,7 +9,7 @@ from pyufunc import util_ai from pyufunc import util_algorithm -from pyufunc import util_common +from pyufunc import util_magic from pyufunc import util_data_processing from pyufunc import util_datetime from pyufunc import util_fullstack @@ -31,7 +31,7 @@ config_FUNC_CATEGORY = { "util_ai": util_ai.__all__, "util_algorithm": util_algorithm.__all__, - "util_common": util_common.__all__, + "util_common": util_magic.__all__, "util_data_processing": util_data_processing.__all__, "util_datetime": util_datetime.__all__, "util_fullstack": util_fullstack.__all__, diff --git a/pyufunc/__init__.py b/pyufunc/__init__.py index e0f1cfc..2479d96 100644 --- a/pyufunc/__init__.py +++ b/pyufunc/__init__.py @@ -9,7 +9,7 @@ # import all modules from .util_ai import * # machine learning functions # noqa: F403 from .util_algorithm import * # algorithm functions # noqa: F403 -from .util_common import * # unclassified functions are here # noqa: F403 +from .util_magic import * # unclassified functions are here # noqa: F403 from .util_data_processing import * # data processing functions including algorithms # noqa: F403 from .util_datetime import * # datetime functions # noqa: F403 from .util_fullstack import * # fullstack functions, including front end and back end # noqa: F403 diff --git a/pyufunc/util_ai/_error_measurement.py b/pyufunc/util_ai/_error_measurement.py index 6695e3f..cf117ae 100644 --- a/pyufunc/util_ai/_error_measurement.py +++ b/pyufunc/util_ai/_error_measurement.py @@ -6,7 +6,7 @@ ############################################################## from __future__ import annotations from typing import TYPE_CHECKING, Iterable -from pyufunc.util_common import requires, import_package +from pyufunc.util_magic import requires, import_package import numpy as np diff --git a/pyufunc/util_datetime/_dt_format.py b/pyufunc/util_datetime/_dt_format.py index 0c769cd..7cbd9e2 100644 --- a/pyufunc/util_datetime/_dt_format.py +++ b/pyufunc/util_datetime/_dt_format.py @@ -8,7 +8,7 @@ import datetime from typing import TYPE_CHECKING, Union from pyufunc.pkg_configs import config_datetime_fmt -from pyufunc.util_common import requires, import_package +from pyufunc.util_magic import requires, import_package if TYPE_CHECKING: import dateutil diff --git a/pyufunc/util_datetime/_dt_group.py b/pyufunc/util_datetime/_dt_group.py index b7d3dc2..4e09d7b 100644 --- a/pyufunc/util_datetime/_dt_group.py +++ b/pyufunc/util_datetime/_dt_group.py @@ -9,7 +9,7 @@ from typing import TYPE_CHECKING import pandas as pd -from pyufunc.util_common import func_running_time +from pyufunc.util_magic import func_running_time @func_running_time diff --git a/pyufunc/util_geo/_geo_circle.py b/pyufunc/util_geo/_geo_circle.py index 46fab37..11aa597 100644 --- a/pyufunc/util_geo/_geo_circle.py +++ b/pyufunc/util_geo/_geo_circle.py @@ -7,7 +7,7 @@ from __future__ import annotations import math from typing import Iterable, Union, TYPE_CHECKING -from pyufunc.util_common import requires, import_package +from pyufunc.util_magic import requires, import_package # https://stackoverflow.com/questions/61384752/how-to-type-hint-with-an-optional-import if TYPE_CHECKING: diff --git a/pyufunc/util_geo/_geo_distance.py b/pyufunc/util_geo/_geo_distance.py index 7f8af10..66d6bd7 100644 --- a/pyufunc/util_geo/_geo_distance.py +++ b/pyufunc/util_geo/_geo_distance.py @@ -9,7 +9,7 @@ from typing import Union, Iterable, TYPE_CHECKING import functools from pyufunc.util_geo._geo_circle import create_circle_at_point_with_radius -from pyufunc.util_common import func_running_time, requires, import_package +from pyufunc.util_magic import func_running_time, requires, import_package import numpy as np # https://stackoverflow.com/questions/61384752/how-to-type-hint-with-an-optional-import diff --git a/pyufunc/util_geo/_get_osm_place.py b/pyufunc/util_geo/_get_osm_place.py index 895b031..fd7beae 100644 --- a/pyufunc/util_geo/_get_osm_place.py +++ b/pyufunc/util_geo/_get_osm_place.py @@ -15,8 +15,8 @@ from collections import OrderedDict import time import importlib -from pyufunc.util_common._dependency_requires_decorator import requires -from pyufunc.util_common._import_package import import_package +from pyufunc.util_magic._dependency_requires_decorator import requires +from pyufunc.util_magic._import_package import import_package from typing import Any, TYPE_CHECKING if TYPE_CHECKING: diff --git a/pyufunc/util_geo/_gmns.py b/pyufunc/util_geo/_gmns.py index 455c182..5f750ee 100644 --- a/pyufunc/util_geo/_gmns.py +++ b/pyufunc/util_geo/_gmns.py @@ -12,10 +12,10 @@ from dataclasses import dataclass, field, asdict, fields from multiprocessing import Pool -from pyufunc.util_common._func_time_decorator import func_time +from pyufunc.util_magic._func_time_decorator import func_time from pyufunc.util_pathio._path import path2linux -from pyufunc.util_common._dependency_requires_decorator import requires -from pyufunc.util_common._import_package import import_package +from pyufunc.util_magic._dependency_requires_decorator import requires +from pyufunc.util_magic._import_package import import_package from pyufunc.pkg_configs import config_gmns from pyufunc.util_data_processing._dataclass import extend_dataclass, create_dataclass_from_dict diff --git a/pyufunc/util_git_pypi/_github.py b/pyufunc/util_git_pypi/_github.py index 77077c5..8b2b184 100644 --- a/pyufunc/util_git_pypi/_github.py +++ b/pyufunc/util_git_pypi/_github.py @@ -19,7 +19,7 @@ import shutil from pathlib import Path from typing import TYPE_CHECKING -from pyufunc.util_common import requires, import_package +from pyufunc.util_magic import requires, import_package path_user_agent_strings = Path(__file__).parent.joinpath("static/user-agent-strings.json") diff --git a/pyufunc/util_git_pypi/_pypi.py b/pyufunc/util_git_pypi/_pypi.py index 3de54bf..96eda70 100644 --- a/pyufunc/util_git_pypi/_pypi.py +++ b/pyufunc/util_git_pypi/_pypi.py @@ -5,7 +5,7 @@ # Author/Copyright: Mr. Xiangyong Luo ############################################################## -from pyufunc.util_common import requires +from pyufunc.util_magic import requires @requires("requests", "bs4") diff --git a/pyufunc/util_img/_img_cvt.py b/pyufunc/util_img/_img_cvt.py index cd0e897..07a07ba 100644 --- a/pyufunc/util_img/_img_cvt.py +++ b/pyufunc/util_img/_img_cvt.py @@ -16,8 +16,8 @@ from PIL import Image import cv2 -from pyufunc.util_common._dependency_requires_decorator import requires -from pyufunc.util_common._import_package import import_package +from pyufunc.util_magic._dependency_requires_decorator import requires +from pyufunc.util_magic._import_package import import_package from ._img_operate import img_CV_to_PIL, img_PIL_to_CV diff --git a/pyufunc/util_img/_img_operate.py b/pyufunc/util_img/_img_operate.py index b25eb56..2917cfb 100644 --- a/pyufunc/util_img/_img_operate.py +++ b/pyufunc/util_img/_img_operate.py @@ -16,7 +16,7 @@ import cv2 from PIL import Image -from pyufunc.util_common import requires, import_package +from pyufunc.util_magic import requires, import_package @requires(("pillow", "PIL"), verbose=False) diff --git a/pyufunc/util_log/_log_loguru.py b/pyufunc/util_log/_log_loguru.py index c4953b0..e19772c 100644 --- a/pyufunc/util_log/_log_loguru.py +++ b/pyufunc/util_log/_log_loguru.py @@ -6,7 +6,7 @@ ############################################################## from __future__ import annotations from typing import TYPE_CHECKING -from pyufunc.util_common import requires, import_package +from pyufunc.util_magic import requires, import_package # https://stackoverflow.com/questions/61384752/how-to-type-hint-with-an-optional-import if TYPE_CHECKING: diff --git a/pyufunc/util_common/__init__.py b/pyufunc/util_magic/__init__.py similarity index 100% rename from pyufunc/util_common/__init__.py rename to pyufunc/util_magic/__init__.py diff --git a/pyufunc/util_common/_count_code_size.py b/pyufunc/util_magic/_count_code_size.py similarity index 100% rename from pyufunc/util_common/_count_code_size.py rename to pyufunc/util_magic/_count_code_size.py diff --git a/pyufunc/util_common/_dependency_requires_decorator.py b/pyufunc/util_magic/_dependency_requires_decorator.py similarity index 99% rename from pyufunc/util_common/_dependency_requires_decorator.py rename to pyufunc/util_magic/_dependency_requires_decorator.py index 5034dd3..2cff27c 100644 --- a/pyufunc/util_common/_dependency_requires_decorator.py +++ b/pyufunc/util_magic/_dependency_requires_decorator.py @@ -8,7 +8,7 @@ from __future__ import absolute_import import copy -from pyufunc.util_common._import_package import ( +from pyufunc.util_magic._import_package import ( is_module_importable, import_package) diff --git a/pyufunc/util_common/_end_of_life_decorator.py b/pyufunc/util_magic/_end_of_life_decorator.py similarity index 100% rename from pyufunc/util_common/_end_of_life_decorator.py rename to pyufunc/util_magic/_end_of_life_decorator.py diff --git a/pyufunc/util_common/_func_time_decorator.py b/pyufunc/util_magic/_func_time_decorator.py similarity index 100% rename from pyufunc/util_common/_func_time_decorator.py rename to pyufunc/util_magic/_func_time_decorator.py diff --git a/pyufunc/util_common/_google_numpy_docstring.py b/pyufunc/util_magic/_google_numpy_docstring.py similarity index 100% rename from pyufunc/util_common/_google_numpy_docstring.py rename to pyufunc/util_magic/_google_numpy_docstring.py diff --git a/pyufunc/util_common/_import_package.py b/pyufunc/util_magic/_import_package.py similarity index 100% rename from pyufunc/util_common/_import_package.py rename to pyufunc/util_magic/_import_package.py diff --git a/pyufunc/util_common/_password_generator.py b/pyufunc/util_magic/_password_generator.py similarity index 100% rename from pyufunc/util_common/_password_generator.py rename to pyufunc/util_magic/_password_generator.py diff --git a/pyufunc/util_common/_run_parallel_decorator.py b/pyufunc/util_magic/_run_parallel_decorator.py similarity index 97% rename from pyufunc/util_common/_run_parallel_decorator.py rename to pyufunc/util_magic/_run_parallel_decorator.py index 06b4f8a..5db2aac 100644 --- a/pyufunc/util_common/_run_parallel_decorator.py +++ b/pyufunc/util_magic/_run_parallel_decorator.py @@ -10,7 +10,7 @@ from multiprocessing import Pool from typing import Iterable, Callable, Iterator import os -from pyufunc.util_common._func_time_decorator import func_running_time +from pyufunc.util_magic._func_time_decorator import func_running_time @func_running_time diff --git a/pyufunc/util_common/_time_out.py b/pyufunc/util_magic/_time_out.py similarity index 100% rename from pyufunc/util_common/_time_out.py rename to pyufunc/util_magic/_time_out.py