From bdee353dc0be7bd4bd1a4a53c09a5f5e3d7f2b62 Mon Sep 17 00:00:00 2001 From: Marco Gorelli Date: Tue, 2 Feb 2021 18:09:32 +0000 Subject: [PATCH 1/2] use absolute imports --- .pre-commit-config.yaml | 5 +++ pandas/__init__.py | 2 +- pandas/_libs/tslibs/__init__.py | 34 ++++++++++++------- pandas/core/arrays/boolean.py | 3 +- pandas/core/arrays/floating.py | 3 +- pandas/core/arrays/integer.py | 5 ++- pandas/core/arrays/numeric.py | 3 +- pandas/core/arrays/timedeltas.py | 2 +- pandas/core/strings/__init__.py | 4 +-- pandas/tests/api/test_types.py | 3 +- pandas/tests/arithmetic/test_period.py | 3 +- pandas/tests/extension/arrow/test_bool.py | 5 ++- pandas/tests/extension/arrow/test_string.py | 2 +- .../tests/extension/arrow/test_timestamp.py | 2 +- pandas/tests/extension/base/__init__.py | 28 +++++++-------- pandas/tests/extension/base/casting.py | 3 +- pandas/tests/extension/base/constructors.py | 3 +- pandas/tests/extension/base/dtype.py | 3 +- pandas/tests/extension/base/getitem.py | 3 +- pandas/tests/extension/base/groupby.py | 3 +- pandas/tests/extension/base/interface.py | 3 +- pandas/tests/extension/base/io.py | 3 +- pandas/tests/extension/base/methods.py | 3 +- pandas/tests/extension/base/missing.py | 3 +- pandas/tests/extension/base/ops.py | 3 +- pandas/tests/extension/base/printing.py | 3 +- pandas/tests/extension/base/reduce.py | 3 +- pandas/tests/extension/base/reshaping.py | 3 +- pandas/tests/extension/base/setitem.py | 3 +- pandas/tests/extension/decimal/__init__.py | 7 +++- .../tests/extension/decimal/test_decimal.py | 8 +++-- pandas/tests/extension/json/__init__.py | 2 +- pandas/tests/extension/json/test_json.py | 3 +- pandas/tests/extension/list/__init__.py | 2 +- pandas/tests/extension/list/test_list.py | 3 +- pandas/tests/extension/test_numpy.py | 3 +- pandas/tests/generic/test_frame.py | 3 +- pandas/tests/generic/test_series.py | 3 +- .../indexes/categorical/test_category.py | 3 +- pandas/tests/indexes/datetimelike.py | 3 +- .../indexes/datetimes/test_datetimelike.py | 3 +- pandas/tests/indexes/period/test_period.py | 3 +- pandas/tests/indexes/ranges/test_range.py | 3 +- .../indexes/timedeltas/test_timedelta.py | 3 +- pandas/tests/indexing/test_indexing.py | 3 +- pandas/tests/tseries/offsets/test_ticks.py | 3 +- 46 files changed, 99 insertions(+), 105 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d0940ce8be992..e7b815766a04f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -195,3 +195,8 @@ repos: rev: v0.1.6 hooks: - id: no-string-hints +- repo: https://github.com/MarcoGorelli/abs-imports + rev: v0.1.2 + hooks: + - id: abs-imports + files: ^pandas/ diff --git a/pandas/__init__.py b/pandas/__init__.py index 2b64100075987..cc4c99efc4345 100644 --- a/pandas/__init__.py +++ b/pandas/__init__.py @@ -180,7 +180,7 @@ import pandas.arrays # use the closest tagged version if possible -from ._version import get_versions +from pandas._version import get_versions v = get_versions() __version__ = v.get("closest-tag", v["version"]) diff --git a/pandas/_libs/tslibs/__init__.py b/pandas/_libs/tslibs/__init__.py index f08b86aa63574..6135e54a4502e 100644 --- a/pandas/_libs/tslibs/__init__.py +++ b/pandas/_libs/tslibs/__init__.py @@ -27,18 +27,28 @@ "tz_compare", ] -from . import dtypes -from .conversion import OutOfBoundsTimedelta, localize_pydatetime -from .dtypes import Resolution -from .nattype import NaT, NaTType, iNaT, is_null_datetimelike, nat_strings -from .np_datetime import OutOfBoundsDatetime -from .offsets import BaseOffset, Tick, to_offset -from .period import IncompatibleFrequency, Period -from .timedeltas import Timedelta, delta_to_nanoseconds, ints_to_pytimedelta -from .timestamps import Timestamp -from .timezones import tz_compare -from .tzconversion import tz_convert_from_utc_single -from .vectorized import ( +from pandas._libs.tslibs import dtypes +from pandas._libs.tslibs.conversion import OutOfBoundsTimedelta, localize_pydatetime +from pandas._libs.tslibs.dtypes import Resolution +from pandas._libs.tslibs.nattype import ( + NaT, + NaTType, + iNaT, + is_null_datetimelike, + nat_strings, +) +from pandas._libs.tslibs.np_datetime import OutOfBoundsDatetime +from pandas._libs.tslibs.offsets import BaseOffset, Tick, to_offset +from pandas._libs.tslibs.period import IncompatibleFrequency, Period +from pandas._libs.tslibs.timedeltas import ( + Timedelta, + delta_to_nanoseconds, + ints_to_pytimedelta, +) +from pandas._libs.tslibs.timestamps import Timestamp +from pandas._libs.tslibs.timezones import tz_compare +from pandas._libs.tslibs.tzconversion import tz_convert_from_utc_single +from pandas._libs.tslibs.vectorized import ( dt64arr_to_periodarr, get_resolution, ints_to_pydatetime, diff --git a/pandas/core/arrays/boolean.py b/pandas/core/arrays/boolean.py index dd281a39907fd..86eafb34e847f 100644 --- a/pandas/core/arrays/boolean.py +++ b/pandas/core/arrays/boolean.py @@ -23,8 +23,7 @@ from pandas.core.dtypes.missing import isna from pandas.core import ops - -from .masked import BaseMaskedArray, BaseMaskedDtype +from pandas.core.arrays.masked import BaseMaskedArray, BaseMaskedDtype if TYPE_CHECKING: import pyarrow diff --git a/pandas/core/arrays/floating.py b/pandas/core/arrays/floating.py index 2c3b3d3c2f0b4..bc8f2af4f3801 100644 --- a/pandas/core/arrays/floating.py +++ b/pandas/core/arrays/floating.py @@ -23,11 +23,10 @@ from pandas.core.dtypes.dtypes import ExtensionDtype, register_extension_dtype from pandas.core.dtypes.missing import isna +from pandas.core.arrays.numeric import NumericArray, NumericDtype from pandas.core.ops import invalid_comparison from pandas.core.tools.numeric import to_numeric -from .numeric import NumericArray, NumericDtype - class FloatingDtype(NumericDtype): """ diff --git a/pandas/core/arrays/integer.py b/pandas/core/arrays/integer.py index ff1af80f81ac6..363832ec89240 100644 --- a/pandas/core/arrays/integer.py +++ b/pandas/core/arrays/integer.py @@ -23,12 +23,11 @@ ) from pandas.core.dtypes.missing import isna +from pandas.core.arrays.masked import BaseMaskedArray, BaseMaskedDtype +from pandas.core.arrays.numeric import NumericArray, NumericDtype from pandas.core.ops import invalid_comparison from pandas.core.tools.numeric import to_numeric -from .masked import BaseMaskedArray, BaseMaskedDtype -from .numeric import NumericArray, NumericDtype - class _IntegerDtype(NumericDtype): """ diff --git a/pandas/core/arrays/numeric.py b/pandas/core/arrays/numeric.py index 49f0d7e66c005..69499bc7e4a77 100644 --- a/pandas/core/arrays/numeric.py +++ b/pandas/core/arrays/numeric.py @@ -18,8 +18,7 @@ ) from pandas.core import ops - -from .masked import BaseMaskedArray, BaseMaskedDtype +from pandas.core.arrays.masked import BaseMaskedArray, BaseMaskedDtype if TYPE_CHECKING: import pyarrow diff --git a/pandas/core/arrays/timedeltas.py b/pandas/core/arrays/timedeltas.py index e9160c92435a4..480aaf3d48f62 100644 --- a/pandas/core/arrays/timedeltas.py +++ b/pandas/core/arrays/timedeltas.py @@ -419,7 +419,7 @@ def _add_period(self, other: Period): Add a Period object. """ # We will wrap in a PeriodArray and defer to the reversed operation - from .period import PeriodArray + from pandas.core.arrays.period import PeriodArray i8vals = np.broadcast_to(other.ordinal, self.shape) oth = PeriodArray(i8vals, freq=other.freq) diff --git a/pandas/core/strings/__init__.py b/pandas/core/strings/__init__.py index 243250f0360a0..943686fc85a05 100644 --- a/pandas/core/strings/__init__.py +++ b/pandas/core/strings/__init__.py @@ -26,7 +26,7 @@ # - PandasArray # - Categorical -from .accessor import StringMethods -from .base import BaseStringArrayMethods +from pandas.core.strings.accessor import StringMethods +from pandas.core.strings.base import BaseStringArrayMethods __all__ = ["StringMethods", "BaseStringArrayMethods"] diff --git a/pandas/tests/api/test_types.py b/pandas/tests/api/test_types.py index 31423c03dee34..71804bded3e44 100644 --- a/pandas/tests/api/test_types.py +++ b/pandas/tests/api/test_types.py @@ -1,7 +1,6 @@ import pandas._testing as tm from pandas.api import types - -from .test_api import Base +from pandas.tests.api.test_api import Base class TestTypes(Base): diff --git a/pandas/tests/arithmetic/test_period.py b/pandas/tests/arithmetic/test_period.py index 577b8dec1181d..4a2e8ba8219aa 100644 --- a/pandas/tests/arithmetic/test_period.py +++ b/pandas/tests/arithmetic/test_period.py @@ -14,8 +14,7 @@ import pandas._testing as tm from pandas.core import ops from pandas.core.arrays import TimedeltaArray - -from .common import assert_invalid_comparison +from pandas.tests.arithmetic.common import assert_invalid_comparison # ------------------------------------------------------------------ # Comparisons diff --git a/pandas/tests/extension/arrow/test_bool.py b/pandas/tests/extension/arrow/test_bool.py index 603216a0b5bbb..829be279b45d3 100644 --- a/pandas/tests/extension/arrow/test_bool.py +++ b/pandas/tests/extension/arrow/test_bool.py @@ -8,7 +8,10 @@ pytest.importorskip("pyarrow", minversion="0.13.0") -from .arrays import ArrowBoolArray, ArrowBoolDtype # isort:skip +from pandas.tests.extension.arrow.arrays import ( # isort:skip + ArrowBoolArray, + ArrowBoolDtype, +) @pytest.fixture diff --git a/pandas/tests/extension/arrow/test_string.py b/pandas/tests/extension/arrow/test_string.py index abd5c1f386dc5..23a07b2031bf5 100644 --- a/pandas/tests/extension/arrow/test_string.py +++ b/pandas/tests/extension/arrow/test_string.py @@ -4,7 +4,7 @@ pytest.importorskip("pyarrow", minversion="0.13.0") -from .arrays import ArrowStringDtype # isort:skip +from pandas.tests.extension.arrow.arrays import ArrowStringDtype # isort:skip def test_constructor_from_list(): diff --git a/pandas/tests/extension/arrow/test_timestamp.py b/pandas/tests/extension/arrow/test_timestamp.py index bd661ad20bb02..10e560b34a21c 100644 --- a/pandas/tests/extension/arrow/test_timestamp.py +++ b/pandas/tests/extension/arrow/test_timestamp.py @@ -12,7 +12,7 @@ import pyarrow as pa # isort:skip -from .arrays import ArrowExtensionArray # isort:skip +from pandas.tests.extension.arrow.arrays import ArrowExtensionArray # isort:skip @register_extension_dtype diff --git a/pandas/tests/extension/base/__init__.py b/pandas/tests/extension/base/__init__.py index 323cb843b2d74..9cf3bdab40d0b 100644 --- a/pandas/tests/extension/base/__init__.py +++ b/pandas/tests/extension/base/__init__.py @@ -41,26 +41,26 @@ class TestMyDtype(BaseDtypeTests): ``assert_series_equal`` on your base test class. """ -from .casting import BaseCastingTests # noqa -from .constructors import BaseConstructorsTests # noqa -from .dtype import BaseDtypeTests # noqa -from .getitem import BaseGetitemTests # noqa -from .groupby import BaseGroupbyTests # noqa -from .interface import BaseInterfaceTests # noqa -from .io import BaseParsingTests # noqa -from .methods import BaseMethodsTests # noqa -from .missing import BaseMissingTests # noqa -from .ops import ( # noqa +from pandas.tests.extension.base.casting import BaseCastingTests # noqa +from pandas.tests.extension.base.constructors import BaseConstructorsTests # noqa +from pandas.tests.extension.base.dtype import BaseDtypeTests # noqa +from pandas.tests.extension.base.getitem import BaseGetitemTests # noqa +from pandas.tests.extension.base.groupby import BaseGroupbyTests # noqa +from pandas.tests.extension.base.interface import BaseInterfaceTests # noqa +from pandas.tests.extension.base.io import BaseParsingTests # noqa +from pandas.tests.extension.base.methods import BaseMethodsTests # noqa +from pandas.tests.extension.base.missing import BaseMissingTests # noqa +from pandas.tests.extension.base.ops import ( # noqa BaseArithmeticOpsTests, BaseComparisonOpsTests, BaseOpsUtil, BaseUnaryOpsTests, ) -from .printing import BasePrintingTests # noqa -from .reduce import ( # noqa +from pandas.tests.extension.base.printing import BasePrintingTests # noqa +from pandas.tests.extension.base.reduce import ( # noqa BaseBooleanReduceTests, BaseNoReduceTests, BaseNumericReduceTests, ) -from .reshaping import BaseReshapingTests # noqa -from .setitem import BaseSetitemTests # noqa +from pandas.tests.extension.base.reshaping import BaseReshapingTests # noqa +from pandas.tests.extension.base.setitem import BaseSetitemTests # noqa diff --git a/pandas/tests/extension/base/casting.py b/pandas/tests/extension/base/casting.py index 039b42210224e..0b79a5368a542 100644 --- a/pandas/tests/extension/base/casting.py +++ b/pandas/tests/extension/base/casting.py @@ -3,8 +3,7 @@ import pandas as pd from pandas.core.internals import ObjectBlock - -from .base import BaseExtensionTests +from pandas.tests.extension.base.base import BaseExtensionTests class BaseCastingTests(BaseExtensionTests): diff --git a/pandas/tests/extension/base/constructors.py b/pandas/tests/extension/base/constructors.py index 9dbfd2a5589c0..6f0d8d16a0224 100644 --- a/pandas/tests/extension/base/constructors.py +++ b/pandas/tests/extension/base/constructors.py @@ -3,8 +3,7 @@ import pandas as pd from pandas.core.internals import ExtensionBlock - -from .base import BaseExtensionTests +from pandas.tests.extension.base.base import BaseExtensionTests class BaseConstructorsTests(BaseExtensionTests): diff --git a/pandas/tests/extension/base/dtype.py b/pandas/tests/extension/base/dtype.py index 128e0a9f81e91..5e4d23e91925a 100644 --- a/pandas/tests/extension/base/dtype.py +++ b/pandas/tests/extension/base/dtype.py @@ -5,8 +5,7 @@ import pandas as pd from pandas.api.types import is_object_dtype, is_string_dtype - -from .base import BaseExtensionTests +from pandas.tests.extension.base.base import BaseExtensionTests class BaseDtypeTests(BaseExtensionTests): diff --git a/pandas/tests/extension/base/getitem.py b/pandas/tests/extension/base/getitem.py index bfd6da0fc864d..286ed9c736f31 100644 --- a/pandas/tests/extension/base/getitem.py +++ b/pandas/tests/extension/base/getitem.py @@ -2,8 +2,7 @@ import pytest import pandas as pd - -from .base import BaseExtensionTests +from pandas.tests.extension.base.base import BaseExtensionTests class BaseGetitemTests(BaseExtensionTests): diff --git a/pandas/tests/extension/base/groupby.py b/pandas/tests/extension/base/groupby.py index c81304695f353..30b115b9dba6f 100644 --- a/pandas/tests/extension/base/groupby.py +++ b/pandas/tests/extension/base/groupby.py @@ -2,8 +2,7 @@ import pandas as pd import pandas._testing as tm - -from .base import BaseExtensionTests +from pandas.tests.extension.base.base import BaseExtensionTests class BaseGroupbyTests(BaseExtensionTests): diff --git a/pandas/tests/extension/base/interface.py b/pandas/tests/extension/base/interface.py index 6a4ff68b4580f..05a28f20b956a 100644 --- a/pandas/tests/extension/base/interface.py +++ b/pandas/tests/extension/base/interface.py @@ -5,8 +5,7 @@ import pandas as pd import pandas._testing as tm - -from .base import BaseExtensionTests +from pandas.tests.extension.base.base import BaseExtensionTests class BaseInterfaceTests(BaseExtensionTests): diff --git a/pandas/tests/extension/base/io.py b/pandas/tests/extension/base/io.py index 3de752a8c682a..a8c25db3181d0 100644 --- a/pandas/tests/extension/base/io.py +++ b/pandas/tests/extension/base/io.py @@ -4,8 +4,7 @@ import pytest import pandas as pd - -from .base import BaseExtensionTests +from pandas.tests.extension.base.base import BaseExtensionTests class BaseParsingTests(BaseExtensionTests): diff --git a/pandas/tests/extension/base/methods.py b/pandas/tests/extension/base/methods.py index 5906221389b35..b6b07e00ef429 100644 --- a/pandas/tests/extension/base/methods.py +++ b/pandas/tests/extension/base/methods.py @@ -8,8 +8,7 @@ import pandas as pd import pandas._testing as tm from pandas.core.sorting import nargsort - -from .base import BaseExtensionTests +from pandas.tests.extension.base.base import BaseExtensionTests class BaseMethodsTests(BaseExtensionTests): diff --git a/pandas/tests/extension/base/missing.py b/pandas/tests/extension/base/missing.py index a5969ef961bab..0cf03533915f2 100644 --- a/pandas/tests/extension/base/missing.py +++ b/pandas/tests/extension/base/missing.py @@ -2,8 +2,7 @@ import pandas as pd import pandas._testing as tm - -from .base import BaseExtensionTests +from pandas.tests.extension.base.base import BaseExtensionTests class BaseMissingTests(BaseExtensionTests): diff --git a/pandas/tests/extension/base/ops.py b/pandas/tests/extension/base/ops.py index 5e00d7530d413..bae8e9df72d41 100644 --- a/pandas/tests/extension/base/ops.py +++ b/pandas/tests/extension/base/ops.py @@ -5,8 +5,7 @@ import pandas as pd import pandas._testing as tm from pandas.core import ops - -from .base import BaseExtensionTests +from pandas.tests.extension.base.base import BaseExtensionTests class BaseOpsUtil(BaseExtensionTests): diff --git a/pandas/tests/extension/base/printing.py b/pandas/tests/extension/base/printing.py index ad34a83c7cf71..eab75be66080f 100644 --- a/pandas/tests/extension/base/printing.py +++ b/pandas/tests/extension/base/printing.py @@ -3,8 +3,7 @@ import pytest import pandas as pd - -from .base import BaseExtensionTests +from pandas.tests.extension.base.base import BaseExtensionTests class BasePrintingTests(BaseExtensionTests): diff --git a/pandas/tests/extension/base/reduce.py b/pandas/tests/extension/base/reduce.py index 55f8aca1b8ae0..0f7bd59411eb5 100644 --- a/pandas/tests/extension/base/reduce.py +++ b/pandas/tests/extension/base/reduce.py @@ -4,8 +4,7 @@ import pandas as pd import pandas._testing as tm - -from .base import BaseExtensionTests +from pandas.tests.extension.base.base import BaseExtensionTests class BaseReduceTests(BaseExtensionTests): diff --git a/pandas/tests/extension/base/reshaping.py b/pandas/tests/extension/base/reshaping.py index 44e3fc1eb56d8..18f6084f989dc 100644 --- a/pandas/tests/extension/base/reshaping.py +++ b/pandas/tests/extension/base/reshaping.py @@ -5,8 +5,7 @@ import pandas as pd from pandas.core.internals import ExtensionBlock - -from .base import BaseExtensionTests +from pandas.tests.extension.base.base import BaseExtensionTests class BaseReshapingTests(BaseExtensionTests): diff --git a/pandas/tests/extension/base/setitem.py b/pandas/tests/extension/base/setitem.py index 9ec842d801919..16b9b8e8efdea 100644 --- a/pandas/tests/extension/base/setitem.py +++ b/pandas/tests/extension/base/setitem.py @@ -3,8 +3,7 @@ import pandas as pd import pandas._testing as tm - -from .base import BaseExtensionTests +from pandas.tests.extension.base.base import BaseExtensionTests class BaseSetitemTests(BaseExtensionTests): diff --git a/pandas/tests/extension/decimal/__init__.py b/pandas/tests/extension/decimal/__init__.py index 8194327f8812e..34727b43a7b0f 100644 --- a/pandas/tests/extension/decimal/__init__.py +++ b/pandas/tests/extension/decimal/__init__.py @@ -1,3 +1,8 @@ -from .array import DecimalArray, DecimalDtype, make_data, to_decimal +from pandas.tests.extension.decimal.array import ( + DecimalArray, + DecimalDtype, + make_data, + to_decimal, +) __all__ = ["DecimalArray", "DecimalDtype", "to_decimal", "make_data"] diff --git a/pandas/tests/extension/decimal/test_decimal.py b/pandas/tests/extension/decimal/test_decimal.py index 63980b628b8d2..16278ec1ccc53 100644 --- a/pandas/tests/extension/decimal/test_decimal.py +++ b/pandas/tests/extension/decimal/test_decimal.py @@ -8,8 +8,12 @@ import pandas as pd import pandas._testing as tm from pandas.tests.extension import base - -from .array import DecimalArray, DecimalDtype, make_data, to_decimal +from pandas.tests.extension.decimal.array import ( + DecimalArray, + DecimalDtype, + make_data, + to_decimal, +) @pytest.fixture diff --git a/pandas/tests/extension/json/__init__.py b/pandas/tests/extension/json/__init__.py index e205c7ee50974..b6402b6c09526 100644 --- a/pandas/tests/extension/json/__init__.py +++ b/pandas/tests/extension/json/__init__.py @@ -1,3 +1,3 @@ -from .array import JSONArray, JSONDtype, make_data +from pandas.tests.extension.json.array import JSONArray, JSONDtype, make_data __all__ = ["JSONArray", "JSONDtype", "make_data"] diff --git a/pandas/tests/extension/json/test_json.py b/pandas/tests/extension/json/test_json.py index 30b2ee390bf1a..90a39f3b33e95 100644 --- a/pandas/tests/extension/json/test_json.py +++ b/pandas/tests/extension/json/test_json.py @@ -6,8 +6,7 @@ import pandas as pd import pandas._testing as tm from pandas.tests.extension import base - -from .array import JSONArray, JSONDtype, make_data +from pandas.tests.extension.json.array import JSONArray, JSONDtype, make_data @pytest.fixture diff --git a/pandas/tests/extension/list/__init__.py b/pandas/tests/extension/list/__init__.py index 108f1937d07d3..1cd85657e0de4 100644 --- a/pandas/tests/extension/list/__init__.py +++ b/pandas/tests/extension/list/__init__.py @@ -1,3 +1,3 @@ -from .array import ListArray, ListDtype, make_data +from pandas.tests.extension.list.array import ListArray, ListDtype, make_data __all__ = ["ListArray", "ListDtype", "make_data"] diff --git a/pandas/tests/extension/list/test_list.py b/pandas/tests/extension/list/test_list.py index c5c4417155562..832bdf5bea3cf 100644 --- a/pandas/tests/extension/list/test_list.py +++ b/pandas/tests/extension/list/test_list.py @@ -1,8 +1,7 @@ import pytest import pandas as pd - -from .array import ListArray, ListDtype, make_data +from pandas.tests.extension.list.array import ListArray, ListDtype, make_data @pytest.fixture diff --git a/pandas/tests/extension/test_numpy.py b/pandas/tests/extension/test_numpy.py index 07b574af2ef62..67bc9f3f58daa 100644 --- a/pandas/tests/extension/test_numpy.py +++ b/pandas/tests/extension/test_numpy.py @@ -21,8 +21,7 @@ import pandas as pd import pandas._testing as tm from pandas.core.arrays.numpy_ import PandasArray - -from . import base +from pandas.tests.extension import base @pytest.fixture(params=["float", "object"]) diff --git a/pandas/tests/generic/test_frame.py b/pandas/tests/generic/test_frame.py index 757f71730819d..194b8bdd4715e 100644 --- a/pandas/tests/generic/test_frame.py +++ b/pandas/tests/generic/test_frame.py @@ -7,8 +7,7 @@ import pandas as pd from pandas import DataFrame, MultiIndex, Series, date_range import pandas._testing as tm - -from .test_generic import Generic +from pandas.tests.generic.test_generic import Generic class TestDataFrame(Generic): diff --git a/pandas/tests/generic/test_series.py b/pandas/tests/generic/test_series.py index 474661e0f2e0a..38ab8d333e880 100644 --- a/pandas/tests/generic/test_series.py +++ b/pandas/tests/generic/test_series.py @@ -6,8 +6,7 @@ import pandas as pd from pandas import MultiIndex, Series, date_range import pandas._testing as tm - -from .test_generic import Generic +from pandas.tests.generic.test_generic import Generic class TestSeries(Generic): diff --git a/pandas/tests/indexes/categorical/test_category.py b/pandas/tests/indexes/categorical/test_category.py index 2119600887ba4..75b3a6ece0b21 100644 --- a/pandas/tests/indexes/categorical/test_category.py +++ b/pandas/tests/indexes/categorical/test_category.py @@ -7,8 +7,7 @@ from pandas import Categorical import pandas._testing as tm from pandas.core.indexes.api import CategoricalIndex, Index - -from ..common import Base +from pandas.tests.indexes.common import Base class TestCategoricalIndex(Base): diff --git a/pandas/tests/indexes/datetimelike.py b/pandas/tests/indexes/datetimelike.py index c128f4ab6b7dd..41f8e3408d191 100644 --- a/pandas/tests/indexes/datetimelike.py +++ b/pandas/tests/indexes/datetimelike.py @@ -5,8 +5,7 @@ import pandas as pd import pandas._testing as tm - -from .common import Base +from pandas.tests.indexes.common import Base class DatetimeLike(Base): diff --git a/pandas/tests/indexes/datetimes/test_datetimelike.py b/pandas/tests/indexes/datetimes/test_datetimelike.py index a5abf2946feda..0360b33a4a519 100644 --- a/pandas/tests/indexes/datetimes/test_datetimelike.py +++ b/pandas/tests/indexes/datetimes/test_datetimelike.py @@ -3,8 +3,7 @@ from pandas import DatetimeIndex, date_range import pandas._testing as tm - -from ..datetimelike import DatetimeLike +from pandas.tests.indexes.datetimelike import DatetimeLike class TestDatetimeIndex(DatetimeLike): diff --git a/pandas/tests/indexes/period/test_period.py b/pandas/tests/indexes/period/test_period.py index 377ae7533ba08..fd4b34a1b32a9 100644 --- a/pandas/tests/indexes/period/test_period.py +++ b/pandas/tests/indexes/period/test_period.py @@ -17,8 +17,7 @@ period_range, ) import pandas._testing as tm - -from ..datetimelike import DatetimeLike +from pandas.tests.indexes.datetimelike import DatetimeLike class TestPeriodIndex(DatetimeLike): diff --git a/pandas/tests/indexes/ranges/test_range.py b/pandas/tests/indexes/ranges/test_range.py index b34fb44a57c7e..57df2a1e83418 100644 --- a/pandas/tests/indexes/ranges/test_range.py +++ b/pandas/tests/indexes/ranges/test_range.py @@ -6,8 +6,7 @@ import pandas as pd from pandas import Float64Index, Index, Int64Index, RangeIndex import pandas._testing as tm - -from ..test_numeric import Numeric +from pandas.tests.indexes.test_numeric import Numeric # aliases to make some tests easier to read RI = RangeIndex diff --git a/pandas/tests/indexes/timedeltas/test_timedelta.py b/pandas/tests/indexes/timedeltas/test_timedelta.py index a86cd8dd11c59..d16a32247b917 100644 --- a/pandas/tests/indexes/timedeltas/test_timedelta.py +++ b/pandas/tests/indexes/timedeltas/test_timedelta.py @@ -14,8 +14,7 @@ timedelta_range, ) import pandas._testing as tm - -from ..datetimelike import DatetimeLike +from pandas.tests.indexes.datetimelike import DatetimeLike randn = np.random.randn diff --git a/pandas/tests/indexing/test_indexing.py b/pandas/tests/indexing/test_indexing.py index d490a23317fef..686f383deab37 100644 --- a/pandas/tests/indexing/test_indexing.py +++ b/pandas/tests/indexing/test_indexing.py @@ -14,8 +14,7 @@ import pandas._testing as tm from pandas.core.indexing import maybe_numeric_slice, non_reducing_slice from pandas.tests.indexing.common import _mklbl - -from .test_floats import gen_obj +from pandas.tests.indexing.test_floats import gen_obj # ------------------------------------------------------------------------ # Indexing test cases diff --git a/pandas/tests/tseries/offsets/test_ticks.py b/pandas/tests/tseries/offsets/test_ticks.py index c1621669bffd0..5f7f1b898877c 100644 --- a/pandas/tests/tseries/offsets/test_ticks.py +++ b/pandas/tests/tseries/offsets/test_ticks.py @@ -11,12 +11,11 @@ from pandas import Timedelta, Timestamp import pandas._testing as tm +from pandas.tests.tseries.offsets.common import assert_offset_equal from pandas.tseries import offsets from pandas.tseries.offsets import Hour, Micro, Milli, Minute, Nano, Second -from .common import assert_offset_equal - # --------------------------------------------------------------------- # Test Helpers From 18b18abab2dca42f850fa8c806750d47c7940f57 Mon Sep 17 00:00:00 2001 From: Marco Gorelli Date: Wed, 3 Feb 2021 09:16:31 +0000 Subject: [PATCH 2/2] use absolute import in versioneer.py --- versioneer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versioneer.py b/versioneer.py index e7fed874ae20f..68c9bb161f206 100644 --- a/versioneer.py +++ b/versioneer.py @@ -1776,7 +1776,7 @@ def make_release_tree(self, base_dir, files): """ INIT_PY_SNIPPET = """ -from ._version import get_versions +from pandas._version import get_versions __version__ = get_versions()['version'] del get_versions """