From 4b25c12ddec16dc5bbb5d7821643e66bf81f4060 Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Sat, 9 Jan 2021 20:21:18 +0000 Subject: [PATCH 1/2] TYP: prep _generate_range_overflow_safe for numpy 1.2 --- pandas/core/arrays/_ranges.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pandas/core/arrays/_ranges.py b/pandas/core/arrays/_ranges.py index 14b442bf71080..ce57d1e3efbff 100644 --- a/pandas/core/arrays/_ranges.py +++ b/pandas/core/arrays/_ranges.py @@ -69,8 +69,11 @@ def generate_regular_range( def _generate_range_overflow_safe( - endpoint: int, periods: int, stride: int, side: str = "start" -) -> int: + endpoint: Union[int, np.integer], + periods: Union[int, np.integer], + stride: int, + side: str = "start", +) -> np.integer: """ Calculate the second endpoint for passing to np.arange, checking to avoid an integer overflow. Catch OverflowError and re-raise @@ -89,7 +92,7 @@ def _generate_range_overflow_safe( Returns ------- - other_end : int + np.integer Raises ------ @@ -136,8 +139,11 @@ def _generate_range_overflow_safe( def _generate_range_overflow_safe_signed( - endpoint: int, periods: int, stride: int, side: str -) -> int: + endpoint: Union[int, np.integer], + periods: Union[int, np.integer], + stride: int, + side: str, +) -> np.integer: """ A special case for _generate_range_overflow_safe where `periods * stride` can be calculated without overflowing int64 bounds. From a7bea7d3c57b5372ecfc9e9238e31ee40a899e50 Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Mon, 11 Jan 2021 20:40:06 +0000 Subject: [PATCH 2/2] remove problematic type annotations for now --- pandas/core/arrays/_ranges.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pandas/core/arrays/_ranges.py b/pandas/core/arrays/_ranges.py index ce57d1e3efbff..dfed3c927b810 100644 --- a/pandas/core/arrays/_ranges.py +++ b/pandas/core/arrays/_ranges.py @@ -69,11 +69,8 @@ def generate_regular_range( def _generate_range_overflow_safe( - endpoint: Union[int, np.integer], - periods: Union[int, np.integer], - stride: int, - side: str = "start", -) -> np.integer: + endpoint: int, periods: int, stride: int, side: str = "start" +): """ Calculate the second endpoint for passing to np.arange, checking to avoid an integer overflow. Catch OverflowError and re-raise @@ -139,11 +136,8 @@ def _generate_range_overflow_safe( def _generate_range_overflow_safe_signed( - endpoint: Union[int, np.integer], - periods: Union[int, np.integer], - stride: int, - side: str, -) -> np.integer: + endpoint: int, periods: int, stride: int, side: str +): """ A special case for _generate_range_overflow_safe where `periods * stride` can be calculated without overflowing int64 bounds.