Skip to content

Commit fedd273

Browse files
committed
Fix NameError by properly defining Timedelta before using it
1 parent 5b02464 commit fedd273

File tree

2 files changed

+3
-12
lines changed

2 files changed

+3
-12
lines changed

ci/code_checks.sh

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -73,17 +73,8 @@ if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
7373
-i "pandas.Period.freq GL08" \
7474
-i "pandas.Period.ordinal GL08" \
7575
-i "pandas.RangeIndex.from_range PR01,SA01" \
76-
<<<<<<< HEAD
7776
-i "pandas.Series.dt.unit GL08" \
7877
-i "pandas.Series.pad PR01,SA01" \
79-
=======
80-
-i "pandas.Timedelta.max PR02" \
81-
-i "pandas.Timedelta.min PR02" \
82-
-i "pandas.Timedelta.resolution PR02" \
83-
-i "pandas.Timestamp.max PR02" \
84-
-i "pandas.Timestamp.min PR02" \
85-
-i "pandas.Timestamp.resolution PR02" \
86-
>>>>>>> upstream/main
8778
-i "pandas.Timestamp.tzinfo GL08" \
8879
-i "pandas.arrays.ArrowExtensionArray PR07,SA01" \
8980
-i "pandas.arrays.IntervalArray.length SA01" \

pandas/_libs/tslibs/timedeltas.pyx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1945,9 +1945,9 @@ class Timedelta(_Timedelta):
19451945
_req_any_kwargs_new = {"weeks", "days", "hours", "minutes", "seconds",
19461946
"milliseconds", "microseconds", "nanoseconds"}
19471947

1948-
min = Timedelta(np.timedelta64(np.iinfo(np.int64).min + 1, 'ns'))
1949-
max = Timedelta(np.timedelta64(np.iinfo(np.int64).max, 'ns'))
1950-
resolution = Timedelta(1, unit='ns')
1948+
Timedelta.min = Timedelta(np.timedelta64(np.iinfo(np.int64).min + 1, 'ns'))
1949+
Timedelta.max = Timedelta(np.timedelta64(np.iinfo(np.int64).max, 'ns'))
1950+
Timedelta.resolution = Timedelta(1, unit='ns')
19511951

19521952
def __new__(cls, object value=_no_input, unit=None, **kwargs):
19531953
if value is _no_input:

0 commit comments

Comments
 (0)