Skip to content

Commit

Permalink
Use relative imports to make vendoring easier
Browse files Browse the repository at this point in the history
  • Loading branch information
jvolkman committed Feb 6, 2024
1 parent eaba43d commit e403d7c
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 20 deletions.
4 changes: 2 additions & 2 deletions delocate/cmd/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

from typing_extensions import Literal, TypedDict

from delocate import __version__
from delocate.delocating import filter_system_libs
from .. import __version__
from ..delocating import filter_system_libs

logger = logging.getLogger(__name__)

Expand Down
4 changes: 2 additions & 2 deletions delocate/cmd/delocate_addplat.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
from os.path import expanduser, realpath
from os.path import join as exists

from delocate.cmd.common import common_parser, glob_paths, verbosity_config
from delocate.wheeltools import WheelToolsError, add_platforms
from ..cmd.common import common_parser, glob_paths, verbosity_config
from ..wheeltools import WheelToolsError, add_platforms

parser = ArgumentParser(description=__doc__, parents=[common_parser])
parser.add_argument(
Expand Down
4 changes: 2 additions & 2 deletions delocate/cmd/delocate_fuse.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
from os.path import abspath, basename, expanduser
from os.path import join as pjoin

from delocate.cmd.common import common_parser, verbosity_config
from delocate.fuse import fuse_wheels
from ..cmd.common import common_parser, verbosity_config
from ..fuse import fuse_wheels

parser = ArgumentParser(description=__doc__, parents=[common_parser])
parser.add_argument(
Expand Down
8 changes: 4 additions & 4 deletions delocate/cmd/delocate_listdeps.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
from os.path import isdir, realpath
from os.path import sep as psep

from delocate import wheel_libs
from delocate.cmd.common import common_parser, glob_paths, verbosity_config
from delocate.delocating import filter_system_libs
from delocate.libsana import stripped_lib_dict, tree_libs_from_directory
from .. import wheel_libs
from ..cmd.common import common_parser, glob_paths, verbosity_config
from ..delocating import filter_system_libs
from ..libsana import stripped_lib_dict, tree_libs_from_directory

parser = ArgumentParser(description=__doc__, parents=[common_parser])
parser.add_argument(
Expand Down
4 changes: 2 additions & 2 deletions delocate/cmd/delocate_patch.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
from os.path import basename, exists, expanduser
from os.path import join as pjoin

from delocate import patch_wheel
from delocate.cmd.common import common_parser, verbosity_config
from .. import patch_wheel
from ..cmd.common import common_parser, verbosity_config

parser = ArgumentParser(description=__doc__, parents=[common_parser])
parser.add_argument(
Expand Down
4 changes: 2 additions & 2 deletions delocate/cmd/delocate_path.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import os
from argparse import ArgumentParser

from delocate import delocate_path
from delocate.cmd.common import (
from .. import delocate_path
from ..cmd.common import (
common_parser,
delocate_parser,
delocate_values,
Expand Down
4 changes: 2 additions & 2 deletions delocate/cmd/delocate_wheel.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
from os.path import join as pjoin
from typing import List, Optional, Text

from delocate import delocate_wheel
from delocate.cmd.common import (
from .. import delocate_wheel
from ..cmd.common import (
common_parser,
delocate_parser,
delocate_values,
Expand Down
4 changes: 2 additions & 2 deletions delocate/libsana.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
Tuple,
)

import delocate.delocating
from . import delocating

from .tmpdirs import TemporaryDirectory
from .tools import (
Expand Down Expand Up @@ -317,7 +317,7 @@ def _tree_libs_from_libraries(
if missing_libs and not ignore_missing:
# get_dependencies will already have logged details of missing
# libraries.
raise delocate.delocating.DelocationError(
raise delocating.DelocationError(
"Could not find all dependencies."
)

Expand Down
3 changes: 1 addition & 2 deletions delocate/wheeltools.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@

from packaging.utils import parse_wheel_filename

from delocate.pkginfo import read_pkg_info, write_pkg_info

from .pkginfo import read_pkg_info, write_pkg_info
from .tmpdirs import InTemporaryDirectory
from .tools import dir2zip, open_rw, unique_by_index, zip2dir

Expand Down

0 comments on commit e403d7c

Please sign in to comment.