diff --git a/.pylintrc b/.pylintrc index 66b76a52b7c..3cb8c891dfa 100644 --- a/.pylintrc +++ b/.pylintrc @@ -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, diff --git a/pygmt/__init__.py b/pygmt/__init__.py index 0fb12c6652a..733e4ce1205 100644 --- a/pygmt/__init__.py +++ b/pygmt/__init__.py @@ -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 @@ -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 lines = ["GMT library information:"] with Session() as ses: diff --git a/pygmt/base_plotting.py b/pygmt/base_plotting.py index f0ac7142e9a..be722387419 100644 --- a/pygmt/base_plotting.py +++ b/pygmt/base_plotting.py @@ -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, diff --git a/pygmt/clib/__init__.py b/pygmt/clib/__init__.py index a6282f84122..6bf9577b00a 100644 --- a/pygmt/clib/__init__.py +++ b/pygmt/clib/__init__.py @@ -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 diff --git a/pygmt/clib/conversion.py b/pygmt/clib/conversion.py index e851211050d..41c90b91b2a 100644 --- a/pygmt/clib/conversion.py +++ b/pygmt/clib/conversion.py @@ -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): diff --git a/pygmt/clib/loading.py b/pygmt/clib/loading.py index ee9332e86be..f68cda02492 100644 --- a/pygmt/clib/loading.py +++ b/pygmt/clib/loading.py @@ -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(): diff --git a/pygmt/clib/session.py b/pygmt/clib/session.py index 7d53566cb51..94d1884c687 100644 --- a/pygmt/clib/session.py +++ b/pygmt/clib/session.py @@ -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, diff --git a/pygmt/datasets/__init__.py b/pygmt/datasets/__init__.py index 4454903ee11..3d61623bddd 100644 --- a/pygmt/datasets/__init__.py +++ b/pygmt/datasets/__init__.py @@ -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 diff --git a/pygmt/datasets/earth_relief.py b/pygmt/datasets/earth_relief.py index 80c2b1b6217..5884192f49e 100644 --- a/pygmt/datasets/earth_relief.py +++ b/pygmt/datasets/earth_relief.py @@ -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") diff --git a/pygmt/datasets/tutorial.py b/pygmt/datasets/tutorial.py index b56e0ce0e1e..ac6a166efa3 100644 --- a/pygmt/datasets/tutorial.py +++ b/pygmt/datasets/tutorial.py @@ -3,7 +3,7 @@ """ import pandas as pd -from .. import which +from pygmt import which def load_japan_quakes(): diff --git a/pygmt/figure.py b/pygmt/figure.py index 8d4c98a8cd0..f265fc371fd 100644 --- a/pygmt/figure.py +++ b/pygmt/figure.py @@ -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, diff --git a/pygmt/filtering.py b/pygmt/filtering.py index adae7524576..0df30368246 100644 --- a/pygmt/filtering.py +++ b/pygmt/filtering.py @@ -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, diff --git a/pygmt/gridding.py b/pygmt/gridding.py index 2801cd4a406..5d6ae7524c1 100644 --- a/pygmt/gridding.py +++ b/pygmt/gridding.py @@ -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, @@ -13,7 +13,7 @@ kwargs_to_strings, use_alias, ) -from .exceptions import GMTInvalidInput +from pygmt.exceptions import GMTInvalidInput @fmt_docstring diff --git a/pygmt/gridops.py b/pygmt/gridops.py index 845fbee65ff..c18ef39ee41 100644 --- a/pygmt/gridops.py +++ b/pygmt/gridops.py @@ -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, @@ -15,7 +15,7 @@ data_kind, dummy_context, ) -from .exceptions import GMTInvalidInput +from pygmt.exceptions import GMTInvalidInput @fmt_docstring diff --git a/pygmt/helpers/__init__.py b/pygmt/helpers/__init__.py index b8a6958816d..de9aa147e65 100644 --- a/pygmt/helpers/__init__.py +++ b/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, diff --git a/pygmt/helpers/decorators.py b/pygmt/helpers/decorators.py index 28e8fafd896..94e08646f7d 100644 --- a/pygmt/helpers/decorators.py +++ b/pygmt/helpers/decorators.py @@ -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 = { diff --git a/pygmt/helpers/testing.py b/pygmt/helpers/testing.py index 4a324a605d2..364faa532b5 100644 --- a/pygmt/helpers/testing.py +++ b/pygmt/helpers/testing.py @@ -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"): diff --git a/pygmt/helpers/utils.py b/pygmt/helpers/utils.py index 7472e9f410f..a6b7831bf0f 100644 --- a/pygmt/helpers/utils.py +++ b/pygmt/helpers/utils.py @@ -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): diff --git a/pygmt/mathops.py b/pygmt/mathops.py index e74deb82c3a..4730c855d1d 100644 --- a/pygmt/mathops.py +++ b/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 diff --git a/pygmt/modules.py b/pygmt/modules.py index c733bb58790..5c71a266ef6 100644 --- a/pygmt/modules.py +++ b/pygmt/modules.py @@ -4,8 +4,8 @@ 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, @@ -13,7 +13,7 @@ data_kind, dummy_context, ) -from .exceptions import GMTInvalidInput +from pygmt.exceptions import GMTInvalidInput @fmt_docstring diff --git a/pygmt/sampling.py b/pygmt/sampling.py index 1ae93db24f3..85a18a808b9 100644 --- a/pygmt/sampling.py +++ b/pygmt/sampling.py @@ -3,8 +3,8 @@ """ 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, @@ -12,7 +12,7 @@ dummy_context, use_alias, ) -from .exceptions import GMTInvalidInput +from pygmt.exceptions import GMTInvalidInput @fmt_docstring diff --git a/pygmt/session_management.py b/pygmt/session_management.py index e814daf4fb8..55dda754d12 100644 --- a/pygmt/session_management.py +++ b/pygmt/session_management.py @@ -1,7 +1,7 @@ """ Modern mode session management modules. """ -from .clib import Session +from pygmt.clib import Session def begin(): diff --git a/pygmt/sphinx_gallery.py b/pygmt/sphinx_gallery.py index 3de8300a0bd..1f9526ac4c8 100644 --- a/pygmt/sphinx_gallery.py +++ b/pygmt/sphinx_gallery.py @@ -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 diff --git a/pygmt/tests/test_accessor.py b/pygmt/tests/test_accessor.py index 0eb88b7fecd..53ebdd2c145 100644 --- a/pygmt/tests/test_accessor.py +++ b/pygmt/tests/test_accessor.py @@ -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(): diff --git a/pygmt/tests/test_basemap.py b/pygmt/tests/test_basemap.py index 39765c32d50..ad4daafb73a 100644 --- a/pygmt/tests/test_basemap.py +++ b/pygmt/tests/test_basemap.py @@ -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(): diff --git a/pygmt/tests/test_blockmedian.py b/pygmt/tests/test_blockmedian.py index f63fd90a5d8..dfa8c9c9c9a 100644 --- a/pygmt/tests/test_blockmedian.py +++ b/pygmt/tests/test_blockmedian.py @@ -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(): diff --git a/pygmt/tests/test_clib.py b/pygmt/tests/test_clib.py index 1d15be613fe..d6789e6c790 100644 --- a/pygmt/tests/test_clib.py +++ b/pygmt/tests/test_clib.py @@ -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") diff --git a/pygmt/tests/test_clib_loading.py b/pygmt/tests/test_clib_loading.py index 9c11cb698c1..c38db249784 100644 --- a/pygmt/tests/test_clib_loading.py +++ b/pygmt/tests/test_clib_loading.py @@ -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(): diff --git a/pygmt/tests/test_clib_put_matrix.py b/pygmt/tests/test_clib_put_matrix.py index c4ec764396e..781197bfc2d 100644 --- a/pygmt/tests/test_clib_put_matrix.py +++ b/pygmt/tests/test_clib_put_matrix.py @@ -7,10 +7,10 @@ import xarray as xr -from .test_clib import mock -from .. import clib -from ..exceptions import GMTCLibError -from ..helpers import GMTTempFile +from pygmt.tests.test_clib import mock +from pygmt import clib +from pygmt.exceptions import GMTCLibError +from pygmt.helpers import GMTTempFile def test_put_matrix(): diff --git a/pygmt/tests/test_clib_put_strings.py b/pygmt/tests/test_clib_put_strings.py index ce8816b66e8..7b21bd65c02 100644 --- a/pygmt/tests/test_clib_put_strings.py +++ b/pygmt/tests/test_clib_put_strings.py @@ -6,9 +6,9 @@ import pytest from packaging.version import Version -from .. import clib -from ..exceptions import GMTCLibError -from ..helpers import GMTTempFile +from pygmt import clib +from pygmt.exceptions import GMTCLibError +from pygmt.helpers import GMTTempFile with clib.Session() as _lib: gmt_version = Version(_lib.info["version"]) diff --git a/pygmt/tests/test_clib_put_vector.py b/pygmt/tests/test_clib_put_vector.py index ec78e1cc8ee..5ce96530ca2 100644 --- a/pygmt/tests/test_clib_put_vector.py +++ b/pygmt/tests/test_clib_put_vector.py @@ -6,9 +6,9 @@ import numpy.testing as npt import pytest -from .. import clib -from ..exceptions import GMTCLibError, GMTInvalidInput -from ..helpers import GMTTempFile +from pygmt import clib +from pygmt.exceptions import GMTCLibError, GMTInvalidInput +from pygmt.helpers import GMTTempFile def test_put_vector(): diff --git a/pygmt/tests/test_coast.py b/pygmt/tests/test_coast.py index 1f83f94d71e..d249b515d72 100644 --- a/pygmt/tests/test_coast.py +++ b/pygmt/tests/test_coast.py @@ -3,8 +3,8 @@ """ import pytest -from .. import Figure -from ..helpers.testing import check_figures_equal +from pygmt import Figure +from pygmt.helpers.testing import check_figures_equal @pytest.mark.mpl_image_compare diff --git a/pygmt/tests/test_colorbar.py b/pygmt/tests/test_colorbar.py index f03002eb078..c6bc20b07ee 100644 --- a/pygmt/tests/test_colorbar.py +++ b/pygmt/tests/test_colorbar.py @@ -3,8 +3,8 @@ """ import pytest -from .. import Figure -from ..helpers.testing import check_figures_equal +from pygmt import Figure +from pygmt.helpers.testing import check_figures_equal @pytest.mark.mpl_image_compare diff --git a/pygmt/tests/test_config.py b/pygmt/tests/test_config.py index 66c3e84f11a..c13a9687349 100644 --- a/pygmt/tests/test_config.py +++ b/pygmt/tests/test_config.py @@ -3,7 +3,7 @@ """ import pytest -from .. import Figure, config +from pygmt import Figure, config @pytest.mark.mpl_image_compare diff --git a/pygmt/tests/test_contour.py b/pygmt/tests/test_contour.py index 0fb80481bf5..fc567eb542a 100644 --- a/pygmt/tests/test_contour.py +++ b/pygmt/tests/test_contour.py @@ -8,8 +8,8 @@ import numpy as np import pytest -from .. import Figure -from ..exceptions import GMTInvalidInput +from pygmt import Figure +from pygmt.exceptions import GMTInvalidInput TEST_DATA_DIR = os.path.join(os.path.dirname(__file__), "data") diff --git a/pygmt/tests/test_datasets.py b/pygmt/tests/test_datasets.py index ae99b3b7922..699b14c73c5 100644 --- a/pygmt/tests/test_datasets.py +++ b/pygmt/tests/test_datasets.py @@ -5,14 +5,14 @@ import numpy.testing as npt import pytest -from ..datasets import ( +from pygmt.datasets import ( load_japan_quakes, load_earth_relief, load_ocean_ridge_points, load_sample_bathymetry, load_usgs_quakes, ) -from ..exceptions import GMTInvalidInput +from pygmt.exceptions import GMTInvalidInput def test_japan_quakes(): diff --git a/pygmt/tests/test_figure.py b/pygmt/tests/test_figure.py index d3780a2eed2..1f5c79ad227 100644 --- a/pygmt/tests/test_figure.py +++ b/pygmt/tests/test_figure.py @@ -8,8 +8,8 @@ import numpy.testing as npt import pytest -from .. import Figure -from ..exceptions import GMTInvalidInput +from pygmt import Figure +from pygmt.exceptions import GMTInvalidInput def test_figure_region(): diff --git a/pygmt/tests/test_grdcontour.py b/pygmt/tests/test_grdcontour.py index fee5e50d9db..b3ee91c67a7 100644 --- a/pygmt/tests/test_grdcontour.py +++ b/pygmt/tests/test_grdcontour.py @@ -6,10 +6,10 @@ import numpy as np import pytest -from .. import Figure -from ..exceptions import GMTInvalidInput -from ..datasets import load_earth_relief -from ..helpers.testing import check_figures_equal +from pygmt import Figure +from pygmt.exceptions import GMTInvalidInput +from pygmt.datasets import load_earth_relief +from pygmt.helpers.testing import check_figures_equal TEST_DATA_DIR = os.path.join(os.path.dirname(__file__), "data") diff --git a/pygmt/tests/test_grdcut.py b/pygmt/tests/test_grdcut.py index 7617d5156b5..e207a3941a5 100644 --- a/pygmt/tests/test_grdcut.py +++ b/pygmt/tests/test_grdcut.py @@ -6,10 +6,10 @@ import pytest import xarray as xr -from .. import grdcut, grdinfo -from ..datasets import load_earth_relief -from ..exceptions import GMTInvalidInput -from ..helpers import GMTTempFile +from pygmt import grdcut, grdinfo +from pygmt.datasets import load_earth_relief +from pygmt.exceptions import GMTInvalidInput +from pygmt.helpers import GMTTempFile @pytest.fixture(scope="module", name="grid") diff --git a/pygmt/tests/test_grdimage.py b/pygmt/tests/test_grdimage.py index 3e2b5b5ec44..4152f2d9702 100644 --- a/pygmt/tests/test_grdimage.py +++ b/pygmt/tests/test_grdimage.py @@ -7,10 +7,10 @@ import xarray as xr from packaging.version import Version -from .. import Figure, clib -from ..datasets import load_earth_relief -from ..exceptions import GMTInvalidInput -from ..helpers.testing import check_figures_equal +from pygmt import Figure, clib +from pygmt.datasets import load_earth_relief +from pygmt.exceptions import GMTInvalidInput +from pygmt.helpers.testing import check_figures_equal with clib.Session() as _lib: gmt_version = Version(_lib.info["version"]) diff --git a/pygmt/tests/test_grdinfo.py b/pygmt/tests/test_grdinfo.py index 6991000b668..c998c5ae735 100644 --- a/pygmt/tests/test_grdinfo.py +++ b/pygmt/tests/test_grdinfo.py @@ -4,9 +4,9 @@ import numpy as np import pytest -from .. import grdinfo -from ..datasets import load_earth_relief -from ..exceptions import GMTInvalidInput +from pygmt import grdinfo +from pygmt.datasets import load_earth_relief +from pygmt.exceptions import GMTInvalidInput def test_grdinfo(): diff --git a/pygmt/tests/test_grdtrack.py b/pygmt/tests/test_grdtrack.py index 7f3e8816271..ee28de49126 100644 --- a/pygmt/tests/test_grdtrack.py +++ b/pygmt/tests/test_grdtrack.py @@ -7,11 +7,11 @@ import pandas as pd import pytest -from .. import grdtrack -from .. import which -from ..datasets import load_earth_relief, load_ocean_ridge_points -from ..exceptions import GMTInvalidInput -from ..helpers import data_kind +from pygmt import grdtrack +from pygmt import which +from pygmt.datasets import load_earth_relief, load_ocean_ridge_points +from pygmt.exceptions import GMTInvalidInput +from pygmt.helpers import data_kind TEST_DATA_DIR = os.path.join(os.path.dirname(__file__), "data") TEMP_TRACK = os.path.join(TEST_DATA_DIR, "tmp_track.txt") diff --git a/pygmt/tests/test_grdview.py b/pygmt/tests/test_grdview.py index f9166b57b90..b83a37b6442 100644 --- a/pygmt/tests/test_grdview.py +++ b/pygmt/tests/test_grdview.py @@ -3,10 +3,10 @@ """ import pytest -from .. import Figure, grdcut, which -from ..exceptions import GMTInvalidInput -from ..helpers import GMTTempFile, data_kind -from ..helpers.testing import check_figures_equal +from pygmt import Figure, grdcut, which +from pygmt.exceptions import GMTInvalidInput +from pygmt.helpers import GMTTempFile, data_kind +from pygmt.helpers.testing import check_figures_equal @pytest.fixture(scope="module", name="region") diff --git a/pygmt/tests/test_helpers.py b/pygmt/tests/test_helpers.py index 66b61456376..498d85e9f62 100644 --- a/pygmt/tests/test_helpers.py +++ b/pygmt/tests/test_helpers.py @@ -6,8 +6,8 @@ import pytest import numpy as np -from ..helpers import kwargs_to_strings, GMTTempFile, unique_name, data_kind -from ..exceptions import GMTInvalidInput +from pygmt.helpers import kwargs_to_strings, GMTTempFile, unique_name, data_kind +from pygmt.exceptions import GMTInvalidInput @pytest.mark.parametrize( diff --git a/pygmt/tests/test_image.py b/pygmt/tests/test_image.py index 1bc0e1ffeea..59747c7ff90 100644 --- a/pygmt/tests/test_image.py +++ b/pygmt/tests/test_image.py @@ -6,7 +6,7 @@ import pytest -from .. import Figure +from pygmt import Figure TEST_IMG = os.path.join(os.path.dirname(__file__), "baseline", "test_logo.png") diff --git a/pygmt/tests/test_info.py b/pygmt/tests/test_info.py index e4ce734f7e6..3a9e81b9592 100644 --- a/pygmt/tests/test_info.py +++ b/pygmt/tests/test_info.py @@ -9,8 +9,8 @@ import pytest import xarray as xr -from .. import info -from ..exceptions import GMTInvalidInput +from pygmt import info +from pygmt.exceptions import GMTInvalidInput TEST_DATA_DIR = os.path.join(os.path.dirname(__file__), "data") POINTS_DATA = os.path.join(TEST_DATA_DIR, "points.txt") diff --git a/pygmt/tests/test_legend.py b/pygmt/tests/test_legend.py index 2044e7bb2a7..de429569a27 100644 --- a/pygmt/tests/test_legend.py +++ b/pygmt/tests/test_legend.py @@ -3,10 +3,10 @@ """ import pytest -from .. import Figure -from ..exceptions import GMTInvalidInput -from ..helpers import GMTTempFile -from ..helpers.testing import check_figures_equal +from pygmt import Figure +from pygmt.exceptions import GMTInvalidInput +from pygmt.helpers import GMTTempFile +from pygmt.helpers.testing import check_figures_equal @pytest.mark.mpl_image_compare diff --git a/pygmt/tests/test_logo.py b/pygmt/tests/test_logo.py index 6cfc7f4cd0e..2a9ffde1ad0 100644 --- a/pygmt/tests/test_logo.py +++ b/pygmt/tests/test_logo.py @@ -1,8 +1,8 @@ """ Tests for fig.logo """ -from .. import Figure -from ..helpers.testing import check_figures_equal +from pygmt import Figure +from pygmt.helpers.testing import check_figures_equal @check_figures_equal() diff --git a/pygmt/tests/test_makecpt.py b/pygmt/tests/test_makecpt.py index 70443ee1b14..88ce2c9ba50 100644 --- a/pygmt/tests/test_makecpt.py +++ b/pygmt/tests/test_makecpt.py @@ -6,11 +6,11 @@ import numpy as np import pytest -from .. import Figure, makecpt -from ..datasets import load_earth_relief -from ..exceptions import GMTInvalidInput -from ..helpers import GMTTempFile -from ..helpers.testing import check_figures_equal +from pygmt import Figure, makecpt +from pygmt.datasets import load_earth_relief +from pygmt.exceptions import GMTInvalidInput +from pygmt.helpers import GMTTempFile +from pygmt.helpers.testing import check_figures_equal TEST_DATA_DIR = os.path.join(os.path.dirname(__file__), "data") POINTS_DATA = os.path.join(TEST_DATA_DIR, "points.txt") diff --git a/pygmt/tests/test_meca.py b/pygmt/tests/test_meca.py index 4776be1e5b1..6eae638382b 100644 --- a/pygmt/tests/test_meca.py +++ b/pygmt/tests/test_meca.py @@ -7,7 +7,7 @@ import pytest from pygmt.helpers import GMTTempFile -from .. import Figure +from pygmt import Figure TEST_DATA_DIR = os.path.join(os.path.dirname(__file__), "data") diff --git a/pygmt/tests/test_plot.py b/pygmt/tests/test_plot.py index cef4dae5448..76f4754e366 100644 --- a/pygmt/tests/test_plot.py +++ b/pygmt/tests/test_plot.py @@ -11,10 +11,10 @@ import pytest -from .. import Figure -from ..exceptions import GMTInvalidInput -from ..helpers import GMTTempFile -from ..helpers.testing import check_figures_equal +from pygmt import Figure +from pygmt.exceptions import GMTInvalidInput +from pygmt.helpers import GMTTempFile +from pygmt.helpers.testing import check_figures_equal TEST_DATA_DIR = os.path.join(os.path.dirname(__file__), "data") diff --git a/pygmt/tests/test_plot3d.py b/pygmt/tests/test_plot3d.py index ba0590b1a1c..2707915adb4 100644 --- a/pygmt/tests/test_plot3d.py +++ b/pygmt/tests/test_plot3d.py @@ -6,10 +6,10 @@ import numpy as np import pytest -from .. import Figure -from ..exceptions import GMTInvalidInput -from ..helpers import GMTTempFile -from ..helpers.testing import check_figures_equal +from pygmt import Figure +from pygmt.exceptions import GMTInvalidInput +from pygmt.helpers import GMTTempFile +from pygmt.helpers.testing import check_figures_equal TEST_DATA_DIR = os.path.join(os.path.dirname(__file__), "data") diff --git a/pygmt/tests/test_psconvert.py b/pygmt/tests/test_psconvert.py index 47b915462bd..3622949f8ed 100644 --- a/pygmt/tests/test_psconvert.py +++ b/pygmt/tests/test_psconvert.py @@ -3,7 +3,7 @@ """ import os -from .. import Figure +from pygmt import Figure def test_psconvert(): diff --git a/pygmt/tests/test_session_management.py b/pygmt/tests/test_session_management.py index 47c8edc78c1..2c71fe5a889 100644 --- a/pygmt/tests/test_session_management.py +++ b/pygmt/tests/test_session_management.py @@ -3,8 +3,8 @@ """ import os -from ..session_management import begin, end -from ..clib import Session +from pygmt.session_management import begin, end +from pygmt.clib import Session def test_begin_end(): diff --git a/pygmt/tests/test_sphinx_gallery.py b/pygmt/tests/test_sphinx_gallery.py index accca7e7fdb..c0aab17e764 100644 --- a/pygmt/tests/test_sphinx_gallery.py +++ b/pygmt/tests/test_sphinx_gallery.py @@ -10,8 +10,8 @@ except ImportError: sphinx_gallery = None -from ..figure import Figure, SHOWED_FIGURES -from ..sphinx_gallery import PyGMTScraper +from pygmt.figure import Figure, SHOWED_FIGURES +from pygmt.sphinx_gallery import PyGMTScraper @pytest.mark.skipif(sphinx_gallery is None, reason="requires sphinx-gallery") diff --git a/pygmt/tests/test_surface.py b/pygmt/tests/test_surface.py index 08ad8628244..8bea85a61b1 100644 --- a/pygmt/tests/test_surface.py +++ b/pygmt/tests/test_surface.py @@ -6,11 +6,11 @@ import xarray as xr import pytest -from .. import surface -from .. import which -from ..datasets import load_sample_bathymetry -from ..exceptions import GMTInvalidInput -from ..helpers import data_kind +from pygmt import surface +from pygmt import which +from pygmt.datasets import load_sample_bathymetry +from pygmt.exceptions import GMTInvalidInput +from pygmt.helpers import data_kind TEST_DATA_DIR = os.path.join(os.path.dirname(__file__), "data") TEMP_GRID = os.path.join(TEST_DATA_DIR, "tmp_grid.nc") diff --git a/pygmt/tests/test_text.py b/pygmt/tests/test_text.py index e23a04896f9..ef04ac526b9 100644 --- a/pygmt/tests/test_text.py +++ b/pygmt/tests/test_text.py @@ -7,10 +7,10 @@ import pytest import numpy as np -from .. import Figure -from ..exceptions import GMTCLibError, GMTInvalidInput -from ..helpers import GMTTempFile -from ..helpers.testing import check_figures_equal +from pygmt import Figure +from pygmt.exceptions import GMTCLibError, GMTInvalidInput +from pygmt.helpers import GMTTempFile +from pygmt.helpers.testing import check_figures_equal TEST_DATA_DIR = os.path.join(os.path.dirname(__file__), "data") POINTS_DATA = os.path.join(TEST_DATA_DIR, "points.txt") diff --git a/pygmt/tests/test_which.py b/pygmt/tests/test_which.py index 407127b9551..92fd05bce73 100644 --- a/pygmt/tests/test_which.py +++ b/pygmt/tests/test_which.py @@ -5,8 +5,8 @@ import pytest -from .. import which -from ..helpers import unique_name +from pygmt import which +from pygmt.helpers import unique_name def test_which(): diff --git a/pygmt/tests/test_x2sys_cross.py b/pygmt/tests/test_x2sys_cross.py index 50577b738df..445c5ded0da 100644 --- a/pygmt/tests/test_x2sys_cross.py +++ b/pygmt/tests/test_x2sys_cross.py @@ -10,10 +10,10 @@ import pandas as pd import pytest -from .. import x2sys_cross, x2sys_init -from ..datasets import load_sample_bathymetry -from ..exceptions import GMTInvalidInput -from ..helpers import data_kind +from pygmt import x2sys_cross, x2sys_init +from pygmt.datasets import load_sample_bathymetry +from pygmt.exceptions import GMTInvalidInput +from pygmt.helpers import data_kind @pytest.fixture(name="mock_x2sys_home") diff --git a/pygmt/tests/test_x2sys_init.py b/pygmt/tests/test_x2sys_init.py index a6c608e57e1..8d5db494a24 100644 --- a/pygmt/tests/test_x2sys_init.py +++ b/pygmt/tests/test_x2sys_init.py @@ -7,7 +7,7 @@ import pytest -from .. import x2sys_init +from pygmt import x2sys_init @pytest.fixture(name="mock_x2sys_home") diff --git a/pygmt/x2sys.py b/pygmt/x2sys.py index e3803ba7806..da13e745acd 100644 --- a/pygmt/x2sys.py +++ b/pygmt/x2sys.py @@ -7,9 +7,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 ( GMTTempFile, build_arg_string, data_kind,