Skip to content

Commit

Permalink
change util_common to util_magic
Browse files Browse the repository at this point in the history
  • Loading branch information
xyluo25 committed Oct 29, 2024
1 parent e17bea0 commit 5244028
Show file tree
Hide file tree
Showing 24 changed files with 21 additions and 21 deletions.
4 changes: 2 additions & 2 deletions pyufunc/__init.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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__,
Expand Down
2 changes: 1 addition & 1 deletion pyufunc/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pyufunc/util_ai/_error_measurement.py
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
2 changes: 1 addition & 1 deletion pyufunc/util_datetime/_dt_format.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pyufunc/util_datetime/_dt_group.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pyufunc/util_geo/_geo_circle.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion pyufunc/util_geo/_geo_distance.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pyufunc/util_geo/_get_osm_place.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions pyufunc/util_geo/_gmns.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion pyufunc/util_git_pypi/_github.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
2 changes: 1 addition & 1 deletion pyufunc/util_git_pypi/_pypi.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Author/Copyright: Mr. Xiangyong Luo
##############################################################

from pyufunc.util_common import requires
from pyufunc.util_magic import requires


@requires("requests", "bs4")
Expand Down
4 changes: 2 additions & 2 deletions pyufunc/util_img/_img_cvt.py
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
2 changes: 1 addition & 1 deletion pyufunc/util_img/_img_operate.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion pyufunc/util_log/_log_loguru.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
File renamed without changes.

0 comments on commit 5244028

Please sign in to comment.