Add numpy as a 'runtime' dependency (#696)

twoertwein · web-flow · commit 429ed801fa31 · 2023-05-13T17:51:22.000-04:00
* absolute imports

* add numpy as a 'runtime' dependency
diff --git a/pandas-stubs/__init__.pyi b/pandas-stubs/__init__.pyi
@@ -1,4 +1,4 @@
-from . import (
+from pandas import (
     api as api,
     arrays as arrays,
     errors as errors,
@@ -8,15 +8,7 @@ from . import (
     tseries as tseries,
     util as util,
 )
-from ._config import (
-    describe_option as describe_option,
-    get_option as get_option,
-    option_context as option_context,
-    options as options,
-    reset_option as reset_option,
-    set_option as set_option,
-)
-from .core.api import (
+from pandas.core.api import (
     NA as NA,
     ArrowDtype as ArrowDtype,
     BooleanDtype as BooleanDtype,
@@ -73,9 +65,9 @@ from .core.api import (
     unique as unique,
     value_counts as value_counts,
 )
-from .core.arrays.sparse import SparseDtype as SparseDtype
-from .core.computation.api import eval as eval
-from .core.reshape.api import (
+from pandas.core.arrays.sparse import SparseDtype as SparseDtype
+from pandas.core.computation.api import eval as eval
+from pandas.core.reshape.api import (
     concat as concat,
     crosstab as crosstab,
     cut as cut,
@@ -91,7 +83,20 @@ from .core.reshape.api import (
     qcut as qcut,
     wide_to_long as wide_to_long,
 )
-from .io.api import (
+
+from pandas._config import (
+    describe_option as describe_option,
+    get_option as get_option,
+    option_context as option_context,
+    options as options,
+    reset_option as reset_option,
+    set_option as set_option,
+)
+
+from pandas.util._print_versions import show_versions as show_versions
+from pandas.util._tester import test as test
+
+from pandas.io.api import (
     ExcelFile as ExcelFile,
     ExcelWriter as ExcelWriter,
     HDFStore as HDFStore,
@@ -117,10 +122,8 @@ from .io.api import (
     read_xml as read_xml,
     to_pickle as to_pickle,
 )
-from .io.json import json_normalize as json_normalize
-from .tseries import offsets as offsets
-from .tseries.api import infer_freq as infer_freq
-from .util._print_versions import show_versions as show_versions
-from .util._tester import test as test
+from pandas.io.json._normalize import json_normalize as json_normalize
+from pandas.tseries import offsets as offsets
+from pandas.tseries.api import infer_freq as infer_freq
 
 __version__: str
diff --git a/pandas-stubs/_libs/__init__.pyi b/pandas-stubs/_libs/__init__.pyi
@@ -1,5 +1,5 @@
-from .interval import Interval as Interval
-from .tslibs import (
+from pandas._libs.interval import Interval as Interval
+from pandas._libs.tslibs import (
     NaT as NaT,
     NaTType as NaTType,
     OutOfBoundsDatetime as OutOfBoundsDatetime,
diff --git a/pandas-stubs/_libs/tslibs/__init__.pyi b/pandas-stubs/_libs/tslibs/__init__.pyi
@@ -10,21 +10,20 @@ __all__ = [
     "Tick",
     "OutOfBoundsDatetime",
 ]
-from pandas._libs.tslibs.np_datetime import (
-    OutOfBoundsDatetime as OutOfBoundsDatetime,
-    OutOfBoundsTimedelta as OutOfBoundsTimedelta,
-)
-
-from .nattype import (
+from pandas._libs.tslibs.nattype import (
     NaT,
     NaTType,
     iNaT,
     nat_strings,
 )
-from .offsets import (
+from pandas._libs.tslibs.np_datetime import (
+    OutOfBoundsDatetime as OutOfBoundsDatetime,
+    OutOfBoundsTimedelta as OutOfBoundsTimedelta,
+)
+from pandas._libs.tslibs.offsets import (
     BaseOffset,
     Tick,
 )
-from .period import Period
-from .timedeltas import Timedelta
-from .timestamps import Timestamp
+from pandas._libs.tslibs.period import Period
+from pandas._libs.tslibs.timedeltas import Timedelta
+from pandas._libs.tslibs.timestamps import Timestamp
diff --git a/pandas-stubs/_libs/tslibs/offsets.pyi b/pandas-stubs/_libs/tslibs/offsets.pyi
@@ -16,12 +16,11 @@ import numpy as np
 from pandas.core.indexes.datetimes import DatetimeIndex
 from typing_extensions import Self
 
+from pandas._libs.tslibs.timedeltas import Timedelta
 from pandas._typing import npt
 
 from pandas.tseries.holiday import AbstractHolidayCalendar
 
-from .timedeltas import Timedelta
-
 _DatetimeT = TypeVar("_DatetimeT", bound=date)
 _TimedeltaT = TypeVar("_TimedeltaT", bound=timedelta)
 
diff --git a/pandas-stubs/_libs/tslibs/period.pyi b/pandas-stubs/_libs/tslibs/period.pyi
@@ -20,10 +20,9 @@ from pandas.core.series import (
 from typing_extensions import TypeAlias
 
 from pandas._libs.tslibs import NaTType
+from pandas._libs.tslibs.timestamps import Timestamp
 from pandas._typing import npt
 
-from .timestamps import Timestamp
-
 class IncompatibleFrequency(ValueError): ...
 
 from pandas._libs.tslibs.offsets import BaseOffset
diff --git a/pandas-stubs/api/__init__.pyi b/pandas-stubs/api/__init__.pyi
@@ -1,4 +1,4 @@
-from . import (
+from pandas.api import (
     extensions as extensions,
     indexers as indexers,
     types as types,
diff --git a/pandas-stubs/core/arrays/__init__.pyi b/pandas-stubs/core/arrays/__init__.pyi
@@ -1,18 +1,18 @@
-from .base import (
+from pandas.core.arrays.base import (
     ExtensionArray as ExtensionArray,
     ExtensionOpsMixin as ExtensionOpsMixin,
     ExtensionScalarOpsMixin as ExtensionScalarOpsMixin,
 )
-from .boolean import BooleanArray as BooleanArray
-from .categorical import Categorical as Categorical
-from .datetimes import DatetimeArray as DatetimeArray
-from .integer import IntegerArray as IntegerArray
-from .interval import IntervalArray as IntervalArray
-from .numpy_ import PandasArray as PandasArray
-from .period import (
+from pandas.core.arrays.boolean import BooleanArray as BooleanArray
+from pandas.core.arrays.categorical import Categorical as Categorical
+from pandas.core.arrays.datetimes import DatetimeArray as DatetimeArray
+from pandas.core.arrays.integer import IntegerArray as IntegerArray
+from pandas.core.arrays.interval import IntervalArray as IntervalArray
+from pandas.core.arrays.numpy_ import PandasArray as PandasArray
+from pandas.core.arrays.period import (
     PeriodArray as PeriodArray,
     period_array as period_array,
 )
-from .sparse import SparseArray as SparseArray
-from .string_ import StringArray as StringArray
-from .timedeltas import TimedeltaArray as TimedeltaArray
+from pandas.core.arrays.sparse import SparseArray as SparseArray
+from pandas.core.arrays.string_ import StringArray as StringArray
+from pandas.core.arrays.timedeltas import TimedeltaArray as TimedeltaArray
diff --git a/pandas-stubs/core/arrays/boolean.pyi b/pandas-stubs/core/arrays/boolean.pyi
@@ -1,14 +1,13 @@
 from typing import ClassVar
 
 import numpy as np
+from pandas.core.arrays.masked import BaseMaskedArray as BaseMaskedArray
 
 from pandas._libs.missing import NAType
 from pandas._typing import type_t
 
 from pandas.core.dtypes.base import ExtensionDtype as ExtensionDtype
 
-from .masked import BaseMaskedArray as BaseMaskedArray
-
 class BooleanDtype(ExtensionDtype):
     na_value: ClassVar[NAType]
     @classmethod
diff --git a/pandas-stubs/core/arrays/integer.pyi b/pandas-stubs/core/arrays/integer.pyi
@@ -1,9 +1,9 @@
+from pandas.core.arrays.masked import BaseMaskedArray
+
 from pandas._libs.missing import NAType
 
 from pandas.core.dtypes.base import ExtensionDtype as ExtensionDtype
 
-from .masked import BaseMaskedArray
-
 class _IntegerDtype(ExtensionDtype):
     base: None
     @property
diff --git a/pandas-stubs/core/arrays/sparse/__init__.pyi b/pandas-stubs/core/arrays/sparse/__init__.pyi
@@ -1,6 +1,6 @@
-from .accessor import (
+from pandas.core.arrays.sparse.accessor import (
     SparseAccessor as SparseAccessor,
     SparseFrameAccessor as SparseFrameAccessor,
 )
-from .array import SparseArray as SparseArray
-from .dtype import SparseDtype as SparseDtype
+from pandas.core.arrays.sparse.array import SparseArray as SparseArray
+from pandas.core.arrays.sparse.dtype import SparseDtype as SparseDtype
diff --git a/pandas-stubs/core/series.pyi b/pandas-stubs/core/series.pyi
@@ -20,12 +20,6 @@ from typing import (
     overload,
 )
 
-from core.api import (
-    Int8Dtype as Int8Dtype,
-    Int16Dtype as Int16Dtype,
-    Int32Dtype as Int32Dtype,
-    Int64Dtype as Int64Dtype,
-)
 from matplotlib.axes import (
     Axes as PlotAxes,
     SubplotBase,
@@ -36,9 +30,18 @@ from pandas import (
     Timedelta,
     Timestamp,
 )
+from pandas.core.api import (
+    Int8Dtype as Int8Dtype,
+    Int16Dtype as Int16Dtype,
+    Int32Dtype as Int32Dtype,
+    Int64Dtype as Int64Dtype,
+)
 from pandas.core.arrays.base import ExtensionArray
 from pandas.core.arrays.categorical import CategoricalAccessor
 from pandas.core.arrays.interval import IntervalArray
+from pandas.core.base import IndexOpsMixin
+from pandas.core.frame import DataFrame
+from pandas.core.generic import NDFrame
 from pandas.core.groupby.generic import SeriesGroupBy
 from pandas.core.indexers import BaseIndexer
 from pandas.core.indexes.accessors import (
@@ -57,7 +60,9 @@ from pandas.core.indexes.timedeltas import TimedeltaIndex
 from pandas.core.indexing import (
     _AtIndexer,
     _iAtIndexer,
+    _iLocIndexer,
     _IndexSliceTuple,
+    _LocIndexer,
 )
 from pandas.core.resample import Resampler
 from pandas.core.strings import StringMethods
@@ -140,14 +145,6 @@ from pandas.core.dtypes.base import ExtensionDtype
 
 from pandas.plotting import PlotAccessor
 
-from .base import IndexOpsMixin
-from .frame import DataFrame
-from .generic import NDFrame
-from .indexing import (
-    _iLocIndexer,
-    _LocIndexer,
-)
-
 _bool = bool
 _str = str
 
diff --git a/pandas-stubs/core/window/__init__.pyi b/pandas-stubs/core/window/__init__.pyi
@@ -1,9 +1,9 @@
-from .ewm import ExponentialMovingWindow as ExponentialMovingWindow
-from .expanding import (
+from pandas.core.window.ewm import ExponentialMovingWindow as ExponentialMovingWindow
+from pandas.core.window.expanding import (
     Expanding as Expanding,
     ExpandingGroupby as ExpandingGroupby,
 )
-from .rolling import (
+from pandas.core.window.rolling import (
     Rolling as Rolling,
     RollingGroupby as RollingGroupby,
     Window as Window,
diff --git a/pandas-stubs/io/json/__init__.pyi b/pandas-stubs/io/json/__init__.pyi
@@ -1,3 +1,2 @@
-from ._json import read_json as read_json
-from ._normalize import json_normalize as json_normalize
-from ._table_schema import build_table_schema as build_table_schema
+from pandas.io.json._json import read_json as read_json
+from pandas.io.json._table_schema import build_table_schema as build_table_schema
diff --git a/pandas-stubs/tseries/__init__.pyi b/pandas-stubs/tseries/__init__.pyi
@@ -0,0 +1,4 @@
+from pandas.tseries import (
+    frequencies as frequencies,
+    offsets as offsets,
+)
diff --git a/pandas-stubs/util/__init__.pyi b/pandas-stubs/util/__init__.pyi
@@ -2,9 +2,3 @@ from pandas.core.util.hashing import (
     hash_array as hash_array,
     hash_pandas_object as hash_pandas_object,
 )
-
-from ._decorators import (
-    Appender as Appender,
-    Substitution as Substitution,
-    cache_readonly as cache_readonly,
-)
diff --git a/pandas-stubs/util/_decorators.pyi b/pandas-stubs/util/_decorators.pyi
@@ -4,9 +4,6 @@ from collections.abc import (
 )
 from typing import Any
 
-from pandas._libs.properties import cache_readonly as cache_readonly
-from pandas._typing import F
-
 def deprecate(
     name: str,
     alternative: Callable[..., Any],
@@ -25,19 +22,4 @@ def deprecate_kwarg(
 def rewrite_axis_style_signature(
     name: str, extra_params: list[tuple[str, Any]]
 ) -> Callable[..., Any]: ...
-
-class Substitution:
-    params = ...
-    def __init__(self, *args, **kwargs) -> None: ...
-    def __call__(self, func: F) -> F: ...
-    def update(self, *args, **kwargs) -> None: ...
-
-class Appender:
-    addendum: str | None
-    join = ...
-    def __init__(
-        self, addendum: str | None, join: str = ..., indents: int = ...
-    ) -> None: ...
-    def __call__(self, func: F) -> F: ...
-
 def indent(text: str | None, indents: int = ...) -> str: ...
diff --git a/pyproject.toml b/pyproject.toml
@@ -33,6 +33,7 @@ packages = [
 [tool.poetry.dependencies]
 python = ">=3.8"
 types-pytz = ">= 2022.1.1"
+numpy = ">=1.24.3"
 
 [tool.poetry.dev-dependencies]
 mypy = "1.3.0"
@@ -42,7 +43,6 @@ pytest = ">=7.1.2"
 pyright = ">= 1.1.306"
 poethepoet = ">=0.16.5"
 loguru = ">=0.6.0"
-numpy = ">=1.24.3"
 typing-extensions = ">=4.4.0"
 matplotlib = ">=3.5.1"
 pre-commit = ">=2.19.0"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from . import (`
	`1`	`+from pandas.api import (`
`2`	`2`	`extensions as extensions,`
`3`	`3`	`indexers as indexers,`
`4`	`4`	`types as types,`