Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Convert relative imports to absolute imports #754

Merged
merged 4 commits into from Dec 21, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions .pylintrc
Expand Up @@ -538,8 +538,7 @@ min-public-methods=2

# List of modules that can be imported at any level, not just the top level
# one.
allow-any-import-level=clib,
clib.Session,
allow-any-import-level=pygmt.clib.Session,
sys,
platform,
importlib,
Expand Down
22 changes: 11 additions & 11 deletions pygmt/__init__.py
Expand Up @@ -12,16 +12,16 @@
from pkg_resources import get_distribution

# Import modules to make the high-level GMT Python API
from .session_management import begin as _begin, end as _end
from .figure import Figure
from .filtering import blockmedian
from .gridding import surface
from .sampling import grdtrack
from .mathops import makecpt
from .modules import GMTDataArrayAccessor, config, info, grdinfo, which
from .gridops import grdcut, grdfilter
from .x2sys import x2sys_init, x2sys_cross
from . import datasets
from pygmt.session_management import begin as _begin, end as _end
from pygmt.figure import Figure
from pygmt.filtering import blockmedian
from pygmt.gridding import surface
from pygmt.sampling import grdtrack
from pygmt.mathops import makecpt
from pygmt.modules import GMTDataArrayAccessor, config, info, grdinfo, which
from pygmt.gridops import grdcut, grdfilter
from pygmt.x2sys import x2sys_init, x2sys_cross
from pygmt import datasets

# Get semantic version through setuptools-scm
__version__ = f'v{get_distribution("pygmt").version}' # e.g. v0.1.2.dev3+g0ab3cd78
Expand All @@ -40,7 +40,7 @@ def print_clib_info():
Includes the GMT version, default values for parameters, the path to the
``libgmt`` shared library, and GMT directories.
"""
from .clib import Session
from pygmt.clib import Session
seisman marked this conversation as resolved.
Show resolved Hide resolved

lines = ["GMT library information:"]
with Session() as ses:
Expand Down
6 changes: 3 additions & 3 deletions pygmt/base_plotting.py
Expand Up @@ -6,9 +6,9 @@
import numpy as np
import pandas as pd

from .clib import Session
from .exceptions import GMTError, GMTInvalidInput
from .helpers import (
from pygmt.clib import Session
from pygmt.exceptions import GMTError, GMTInvalidInput
from pygmt.helpers import (
build_arg_string,
dummy_context,
data_kind,
Expand Down
2 changes: 1 addition & 1 deletion pygmt/clib/__init__.py
Expand Up @@ -5,4 +5,4 @@
# The pygmt.clib.Session class wraps the GMT C shared library (libgmt) with a
# pythonic interface. Access to the C library is done through ctypes.

from .session import Session
from pygmt.clib.session import Session
2 changes: 1 addition & 1 deletion pygmt/clib/conversion.py
Expand Up @@ -4,7 +4,7 @@
import numpy as np
import pandas as pd

from ..exceptions import GMTInvalidInput
from pygmt.exceptions import GMTInvalidInput


def dataarray_to_matrix(grid):
Expand Down
2 changes: 1 addition & 1 deletion pygmt/clib/loading.py
Expand Up @@ -9,7 +9,7 @@
import ctypes
from ctypes.util import find_library

from ..exceptions import GMTOSError, GMTCLibError, GMTCLibNotFoundError
from pygmt.exceptions import GMTOSError, GMTCLibError, GMTCLibNotFoundError


def load_libgmt():
Expand Down
6 changes: 3 additions & 3 deletions pygmt/clib/session.py
Expand Up @@ -11,14 +11,14 @@
import numpy as np
import pandas as pd

from ..exceptions import (
from pygmt.exceptions import (
GMTCLibError,
GMTCLibNoSessionError,
GMTInvalidInput,
GMTVersionError,
)
from .loading import load_libgmt
from .conversion import (
from pygmt.clib.loading import load_libgmt
from pygmt.clib.conversion import (
kwargs_to_ctypes_array,
vectors_to_arrays,
dataarray_to_matrix,
Expand Down
4 changes: 2 additions & 2 deletions pygmt/datasets/__init__.py
Expand Up @@ -2,10 +2,10 @@
#
# Load sample data included with GMT (downloaded from the GMT cache server).

from .tutorial import (
from pygmt.datasets.tutorial import (
load_japan_quakes,
load_ocean_ridge_points,
load_sample_bathymetry,
load_usgs_quakes,
)
from .earth_relief import load_earth_relief
from pygmt.datasets.earth_relief import load_earth_relief
6 changes: 3 additions & 3 deletions pygmt/datasets/earth_relief.py
Expand Up @@ -4,9 +4,9 @@
"""
import xarray as xr

from .. import grdcut, which
from ..exceptions import GMTInvalidInput
from ..helpers import kwargs_to_strings
from pygmt import grdcut, which
from pygmt.exceptions import GMTInvalidInput
from pygmt.helpers import kwargs_to_strings


@kwargs_to_strings(region="sequence")
Expand Down
2 changes: 1 addition & 1 deletion pygmt/datasets/tutorial.py
Expand Up @@ -3,7 +3,7 @@
"""
import pandas as pd

from .. import which
from pygmt import which


def load_japan_quakes():
Expand Down
8 changes: 4 additions & 4 deletions pygmt/figure.py
Expand Up @@ -10,10 +10,10 @@
except ImportError:
Image = None

from .clib import Session
from .base_plotting import BasePlotting
from .exceptions import GMTError, GMTInvalidInput
from .helpers import (
from pygmt.clib import Session
from pygmt.base_plotting import BasePlotting
from pygmt.exceptions import GMTError, GMTInvalidInput
from pygmt.helpers import (
build_arg_string,
fmt_docstring,
use_alias,
Expand Down
6 changes: 3 additions & 3 deletions pygmt/filtering.py
Expand Up @@ -3,9 +3,9 @@
"""
import pandas as pd

from .clib import Session
from .exceptions import GMTInvalidInput
from .helpers import (
from pygmt.clib import Session
from pygmt.exceptions import GMTInvalidInput
from pygmt.helpers import (
build_arg_string,
data_kind,
dummy_context,
Expand Down
6 changes: 3 additions & 3 deletions pygmt/gridding.py
Expand Up @@ -3,8 +3,8 @@
"""
import xarray as xr

from .clib import Session
from .helpers import (
from pygmt.clib import Session
from pygmt.helpers import (
build_arg_string,
data_kind,
dummy_context,
Expand All @@ -13,7 +13,7 @@
kwargs_to_strings,
use_alias,
)
from .exceptions import GMTInvalidInput
from pygmt.exceptions import GMTInvalidInput


@fmt_docstring
Expand Down
6 changes: 3 additions & 3 deletions pygmt/gridops.py
Expand Up @@ -5,8 +5,8 @@
import xarray as xr


from .clib import Session
from .helpers import (
from pygmt.clib import Session
from pygmt.helpers import (
build_arg_string,
fmt_docstring,
kwargs_to_strings,
Expand All @@ -15,7 +15,7 @@
data_kind,
dummy_context,
)
from .exceptions import GMTInvalidInput
from pygmt.exceptions import GMTInvalidInput


@fmt_docstring
Expand Down
6 changes: 3 additions & 3 deletions pygmt/helpers/__init__.py
@@ -1,9 +1,9 @@
"""
Functions, classes, decorators, and context managers to help wrap GMT modules.
"""
from .decorators import fmt_docstring, use_alias, kwargs_to_strings
from .tempfile import GMTTempFile, unique_name
from .utils import (
from pygmt.helpers.decorators import fmt_docstring, use_alias, kwargs_to_strings
from pygmt.helpers.tempfile import GMTTempFile, unique_name
from pygmt.helpers.utils import (
data_kind,
dummy_context,
build_arg_string,
Expand Down
4 changes: 2 additions & 2 deletions pygmt/helpers/decorators.py
Expand Up @@ -10,8 +10,8 @@

import numpy as np

from .utils import is_nonstr_iter
from ..exceptions import GMTInvalidInput
from pygmt.helpers.utils import is_nonstr_iter
from pygmt.exceptions import GMTInvalidInput


COMMON_OPTIONS = {
Expand Down
2 changes: 1 addition & 1 deletion pygmt/helpers/testing.py
Expand Up @@ -6,7 +6,7 @@
import string

from matplotlib.testing.compare import compare_images
from ..exceptions import GMTImageComparisonFailure
from pygmt.exceptions import GMTImageComparisonFailure


def check_figures_equal(*, extensions=("png",), tol=0.0, result_dir="result_images"):
Expand Down
2 changes: 1 addition & 1 deletion pygmt/helpers/utils.py
Expand Up @@ -10,7 +10,7 @@

import xarray as xr

from ..exceptions import GMTInvalidInput
from pygmt.exceptions import GMTInvalidInput


def data_kind(data, x=None, y=None, z=None):
Expand Down
6 changes: 3 additions & 3 deletions pygmt/mathops.py
@@ -1,9 +1,9 @@
"""
GMT modules for Mathematical operations on tables or grids
"""
from .clib import Session
from .exceptions import GMTInvalidInput
from .helpers import build_arg_string, fmt_docstring, kwargs_to_strings, use_alias
from pygmt.clib import Session
from pygmt.exceptions import GMTInvalidInput
from pygmt.helpers import build_arg_string, fmt_docstring, kwargs_to_strings, use_alias


@fmt_docstring
Expand Down
6 changes: 3 additions & 3 deletions pygmt/modules.py
Expand Up @@ -4,16 +4,16 @@
import numpy as np
import xarray as xr

from .clib import Session
from .helpers import (
from pygmt.clib import Session
from pygmt.helpers import (
build_arg_string,
fmt_docstring,
GMTTempFile,
use_alias,
data_kind,
dummy_context,
)
from .exceptions import GMTInvalidInput
from pygmt.exceptions import GMTInvalidInput


@fmt_docstring
Expand Down
6 changes: 3 additions & 3 deletions pygmt/sampling.py
Expand Up @@ -3,16 +3,16 @@
"""
import pandas as pd

from .clib import Session
from .helpers import (
from pygmt.clib import Session
from pygmt.helpers import (
build_arg_string,
fmt_docstring,
GMTTempFile,
data_kind,
dummy_context,
use_alias,
)
from .exceptions import GMTInvalidInput
from pygmt.exceptions import GMTInvalidInput


@fmt_docstring
Expand Down
2 changes: 1 addition & 1 deletion pygmt/session_management.py
@@ -1,7 +1,7 @@
"""
Modern mode session management modules.
"""
from .clib import Session
from pygmt.clib import Session


def begin():
Expand Down
2 changes: 1 addition & 1 deletion pygmt/sphinx_gallery.py
Expand Up @@ -6,7 +6,7 @@
except ImportError:
figure_rst = None

from .figure import SHOWED_FIGURES
from pygmt.figure import SHOWED_FIGURES


class PyGMTScraper: # pylint: disable=too-few-public-methods
Expand Down
4 changes: 2 additions & 2 deletions pygmt/tests/test_accessor.py
Expand Up @@ -4,8 +4,8 @@
import pytest
import xarray as xr

from .. import which
from ..exceptions import GMTInvalidInput
from pygmt import which
from pygmt.exceptions import GMTInvalidInput


def test_accessor_gridline_cartesian():
Expand Down
6 changes: 3 additions & 3 deletions pygmt/tests/test_basemap.py
Expand Up @@ -3,9 +3,9 @@
"""
import pytest

from .. import Figure
from ..helpers.testing import check_figures_equal
from ..exceptions import GMTInvalidInput
from pygmt import Figure
from pygmt.helpers.testing import check_figures_equal
from pygmt.exceptions import GMTInvalidInput


def test_basemap_required_args():
Expand Down
8 changes: 4 additions & 4 deletions pygmt/tests/test_blockmedian.py
Expand Up @@ -7,10 +7,10 @@
import pandas as pd
import pytest

from .. import blockmedian
from ..datasets import load_sample_bathymetry
from ..exceptions import GMTInvalidInput
from ..helpers import data_kind, GMTTempFile
from pygmt import blockmedian
from pygmt.datasets import load_sample_bathymetry
from pygmt.exceptions import GMTInvalidInput
from pygmt.helpers import data_kind, GMTTempFile


def test_blockmedian_input_dataframe():
Expand Down
12 changes: 6 additions & 6 deletions pygmt/tests/test_clib.py
Expand Up @@ -12,17 +12,17 @@
from packaging.version import Version
import pytest

from .. import clib
from ..clib.session import FAMILIES, VIAS
from ..clib.conversion import dataarray_to_matrix
from ..exceptions import (
from pygmt import clib
from pygmt.clib.session import FAMILIES, VIAS
from pygmt.clib.conversion import dataarray_to_matrix
from pygmt.exceptions import (
GMTCLibError,
GMTCLibNoSessionError,
GMTInvalidInput,
GMTVersionError,
)
from ..helpers import GMTTempFile
from .. import Figure
from pygmt.helpers import GMTTempFile
from pygmt import Figure


TEST_DATA_DIR = os.path.join(os.path.dirname(__file__), "data")
Expand Down
4 changes: 2 additions & 2 deletions pygmt/tests/test_clib_loading.py
Expand Up @@ -4,8 +4,8 @@
import os
import pytest

from ..clib.loading import clib_names, load_libgmt, check_libgmt
from ..exceptions import GMTCLibError, GMTOSError, GMTCLibNotFoundError
from pygmt.clib.loading import clib_names, load_libgmt, check_libgmt
from pygmt.exceptions import GMTCLibError, GMTOSError, GMTCLibNotFoundError


def test_check_libgmt():
Expand Down