Skip to content

Extend check namespace usage #38347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 9 commits into from
Closed

Extend check namespace usage #38347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4f2b48b
Update inconsistent pandas namespace
kevinetienne Dec 7, 2020
078339e
Update namespace check to check for function
Dec 7, 2020
be1f67d
catch more cases
MarcoGorelli Jan 3, 2021
21edd76
Merge remote-tracking branch 'upstream/master' into pr/kevinetienne/3…
MarcoGorelli Jan 3, 2021
a2aede0
fixup extra failing tests from merge
MarcoGorelli Jan 3, 2021
764679d
import isna and read_csv
MarcoGorelli Jan 3, 2021
0d05638
fixup isna
MarcoGorelli Jan 3, 2021
902d386
fixup regex match in test_integrity
MarcoGorelli Jan 3, 2021
b529548
dont use array fixture
MarcoGorelli Jan 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pandas/tests/api/test_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,9 +235,9 @@ def test_datetime():

with warnings.catch_warnings():
warnings.simplefilter("ignore", FutureWarning)
assert datetime(2015, 1, 2, 0, 0) == pd.datetime(2015, 1, 2, 0, 0)
assert datetime(2015, 1, 2, 0, 0) == datetime(2015, 1, 2, 0, 0)

assert isinstance(pd.datetime(2015, 1, 2, 0, 0), pd.datetime)
assert isinstance(datetime(2015, 1, 2, 0, 0), datetime)


def test_sparsearray():
Expand Down
78 changes: 39 additions & 39 deletions pandas/tests/arithmetic/test_datetime64.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ def test_comparison_invalid(self, tz_naive_fixture, box_with_array):
# invalid date/int comparisons
tz = tz_naive_fixture
ser = Series(range(5))
ser2 = Series(pd.date_range("20010101", periods=5, tz=tz))
ser2 = Series(date_range("20010101", periods=5, tz=tz))

ser = tm.box_expected(ser, box_with_array)
ser2 = tm.box_expected(ser2, box_with_array)
Expand Down Expand Up @@ -283,7 +283,7 @@ def test_series_comparison_scalars(self, val):
def test_timestamp_compare_series(self, left, right):
# see gh-4982
# Make sure we can compare Timestamps on the right AND left hand side.
ser = Series(pd.date_range("20010101", periods=10), name="dates")
ser = Series(date_range("20010101", periods=10), name="dates")
s_nat = ser.copy(deep=True)

ser[0] = Timestamp("nat")
Expand Down Expand Up @@ -380,7 +380,7 @@ def test_comparators(self, op):
)
def test_dti_cmp_datetimelike(self, other, tz_naive_fixture):
tz = tz_naive_fixture
dti = pd.date_range("2016-01-01", periods=2, tz=tz)
dti = date_range("2016-01-01", periods=2, tz=tz)
if tz is not None:
if isinstance(other, np.datetime64):
# no tzaware version available
Expand Down Expand Up @@ -557,7 +557,7 @@ def test_comparison_tzawareness_compat(self, op, box_with_array):
# GH#18162
box = box_with_array

dr = pd.date_range("2016-01-01", periods=6)
dr = date_range("2016-01-01", periods=6)
dz = dr.tz_localize("US/Pacific")

dr = tm.box_expected(dr, box)
Expand Down Expand Up @@ -607,7 +607,7 @@ def test_comparison_tzawareness_compat(self, op, box_with_array):
)
def test_comparison_tzawareness_compat_scalars(self, op, box_with_array):
# GH#18162
dr = pd.date_range("2016-01-01", periods=6)
dr = date_range("2016-01-01", periods=6)
dz = dr.tz_localize("US/Pacific")

dr = tm.box_expected(dr, box_with_array)
Expand Down Expand Up @@ -651,7 +651,7 @@ def test_scalar_comparison_tzawareness(
):
box = box_with_array
tz = tz_aware_fixture
dti = pd.date_range("2016-01-01", periods=2, tz=tz)
dti = date_range("2016-01-01", periods=2, tz=tz)
xbox = box if box not in [pd.Index, pd.array] else np.ndarray

dtarr = tm.box_expected(dti, box_with_array)
Expand Down Expand Up @@ -803,8 +803,8 @@ def test_dt64arr_add_timedeltalike_scalar(
# GH#22005, GH#22163 check DataFrame doesn't raise TypeError
tz = tz_naive_fixture

rng = pd.date_range("2000-01-01", "2000-02-01", tz=tz)
expected = pd.date_range("2000-01-01 02:00", "2000-02-01 02:00", tz=tz)
rng = date_range("2000-01-01", "2000-02-01", tz=tz)
expected = date_range("2000-01-01 02:00", "2000-02-01 02:00", tz=tz)

rng = tm.box_expected(rng, box_with_array)
expected = tm.box_expected(expected, box_with_array)
Expand All @@ -817,8 +817,8 @@ def test_dt64arr_iadd_timedeltalike_scalar(
):
tz = tz_naive_fixture

rng = pd.date_range("2000-01-01", "2000-02-01", tz=tz)
expected = pd.date_range("2000-01-01 02:00", "2000-02-01 02:00", tz=tz)
rng = date_range("2000-01-01", "2000-02-01", tz=tz)
expected = date_range("2000-01-01 02:00", "2000-02-01 02:00", tz=tz)

rng = tm.box_expected(rng, box_with_array)
expected = tm.box_expected(expected, box_with_array)
Expand All @@ -831,8 +831,8 @@ def test_dt64arr_sub_timedeltalike_scalar(
):
tz = tz_naive_fixture

rng = pd.date_range("2000-01-01", "2000-02-01", tz=tz)
expected = pd.date_range("1999-12-31 22:00", "2000-01-31 22:00", tz=tz)
rng = date_range("2000-01-01", "2000-02-01", tz=tz)
expected = date_range("1999-12-31 22:00", "2000-01-31 22:00", tz=tz)

rng = tm.box_expected(rng, box_with_array)
expected = tm.box_expected(expected, box_with_array)
Expand All @@ -845,8 +845,8 @@ def test_dt64arr_isub_timedeltalike_scalar(
):
tz = tz_naive_fixture

rng = pd.date_range("2000-01-01", "2000-02-01", tz=tz)
expected = pd.date_range("1999-12-31 22:00", "2000-01-31 22:00", tz=tz)
rng = date_range("2000-01-01", "2000-02-01", tz=tz)
expected = date_range("1999-12-31 22:00", "2000-01-31 22:00", tz=tz)

rng = tm.box_expected(rng, box_with_array)
expected = tm.box_expected(expected, box_with_array)
Expand Down Expand Up @@ -886,7 +886,7 @@ def test_dt64arr_add_sub_td64_nat(self, box_with_array, tz_naive_fixture):
# GH#23320 special handling for timedelta64("NaT")
tz = tz_naive_fixture

dti = pd.date_range("1994-04-01", periods=9, tz=tz, freq="QS")
dti = date_range("1994-04-01", periods=9, tz=tz, freq="QS")
other = np.timedelta64("NaT")
expected = DatetimeIndex(["NaT"] * 9, tz=tz)

Expand All @@ -906,11 +906,11 @@ def test_dt64arr_add_sub_td64_nat(self, box_with_array, tz_naive_fixture):
def test_dt64arr_add_sub_td64ndarray(self, tz_naive_fixture, box_with_array):

tz = tz_naive_fixture
dti = pd.date_range("2016-01-01", periods=3, tz=tz)
dti = date_range("2016-01-01", periods=3, tz=tz)
tdi = TimedeltaIndex(["-1 Day", "-1 Day", "-1 Day"])
tdarr = tdi.values

expected = pd.date_range("2015-12-31", "2016-01-02", periods=3, tz=tz)
expected = date_range("2015-12-31", "2016-01-02", periods=3, tz=tz)

dtarr = tm.box_expected(dti, box_with_array)
expected = tm.box_expected(expected, box_with_array)
Expand All @@ -920,7 +920,7 @@ def test_dt64arr_add_sub_td64ndarray(self, tz_naive_fixture, box_with_array):
result = tdarr + dtarr
tm.assert_equal(result, expected)

expected = pd.date_range("2016-01-02", "2016-01-04", periods=3, tz=tz)
expected = date_range("2016-01-02", "2016-01-04", periods=3, tz=tz)
expected = tm.box_expected(expected, box_with_array)

result = dtarr - tdarr
Expand All @@ -942,7 +942,7 @@ def test_dt64arr_add_sub_td64ndarray(self, tz_naive_fixture, box_with_array):
)
def test_dt64arr_sub_dtscalar(self, box_with_array, ts):
# GH#8554, GH#22163 DataFrame op should _not_ return dt64 dtype
idx = pd.date_range("2013-01-01", periods=3)._with_freq(None)
idx = date_range("2013-01-01", periods=3)._with_freq(None)
idx = tm.box_expected(idx, box_with_array)

expected = TimedeltaIndex(["0 Days", "1 Day", "2 Days"])
Expand All @@ -957,7 +957,7 @@ def test_dt64arr_sub_datetime64_not_ns(self, box_with_array):
dt64 = np.datetime64("2013-01-01")
assert dt64.dtype == "datetime64[D]"

dti = pd.date_range("20130101", periods=3)._with_freq(None)
dti = date_range("20130101", periods=3)._with_freq(None)
dtarr = tm.box_expected(dti, box_with_array)

expected = TimedeltaIndex(["0 Days", "1 Day", "2 Days"])
Expand All @@ -970,7 +970,7 @@ def test_dt64arr_sub_datetime64_not_ns(self, box_with_array):
tm.assert_equal(result, -expected)

def test_dt64arr_sub_timestamp(self, box_with_array):
ser = pd.date_range("2014-03-17", periods=2, freq="D", tz="US/Eastern")
ser = date_range("2014-03-17", periods=2, freq="D", tz="US/Eastern")
ser = ser._with_freq(None)
ts = ser[0]

Expand Down Expand Up @@ -1004,7 +1004,7 @@ def test_dt64arr_sub_NaT(self, box_with_array):
# Subtraction of datetime-like array-like

def test_dt64arr_sub_dt64object_array(self, box_with_array, tz_naive_fixture):
dti = pd.date_range("2016-01-01", periods=3, tz=tz_naive_fixture)
dti = date_range("2016-01-01", periods=3, tz=tz_naive_fixture)
expected = dti - dti

obj = tm.box_expected(dti, box_with_array)
Expand All @@ -1018,7 +1018,7 @@ def test_dt64arr_sub_dt64object_array(self, box_with_array, tz_naive_fixture):
tm.assert_equal(result, expected)

def test_dt64arr_naive_sub_dt64ndarray(self, box_with_array):
dti = pd.date_range("2016-01-01", periods=3, tz=None)
dti = date_range("2016-01-01", periods=3, tz=None)
dt64vals = dti.values

dtarr = tm.box_expected(dti, box_with_array)
Expand All @@ -1034,7 +1034,7 @@ def test_dt64arr_aware_sub_dt64ndarray_raises(
):

tz = tz_aware_fixture
dti = pd.date_range("2016-01-01", periods=3, tz=tz)
dti = date_range("2016-01-01", periods=3, tz=tz)
dt64vals = dti.values

dtarr = tm.box_expected(dti, box_with_array)
Expand All @@ -1050,7 +1050,7 @@ def test_dt64arr_aware_sub_dt64ndarray_raises(
def test_dt64arr_add_dt64ndarray_raises(self, tz_naive_fixture, box_with_array):

tz = tz_naive_fixture
dti = pd.date_range("2016-01-01", periods=3, tz=tz)
dti = date_range("2016-01-01", periods=3, tz=tz)
dt64vals = dti.values

dtarr = tm.box_expected(dti, box_with_array)
Expand Down Expand Up @@ -1125,7 +1125,7 @@ def test_dt64arr_addsub_time_objects_raises(self, box_with_array, tz_naive_fixtu

tz = tz_naive_fixture

obj1 = pd.date_range("2012-01-01", periods=3, tz=tz)
obj1 = date_range("2012-01-01", periods=3, tz=tz)
obj2 = [time(i, i, i) for i in range(3)]

obj1 = tm.box_expected(obj1, box_with_array)
Expand Down Expand Up @@ -1505,7 +1505,7 @@ def test_dt64arr_add_sub_offset_array(
# GH#10699 array of offsets

tz = tz_naive_fixture
dti = pd.date_range("2017-01-01", periods=2, tz=tz)
dti = date_range("2017-01-01", periods=2, tz=tz)
dtarr = tm.box_expected(dti, box_with_array)

other = np.array([pd.offsets.MonthEnd(), pd.offsets.Day(n=2)])
Expand Down Expand Up @@ -1608,7 +1608,7 @@ def test_dt64_series_arith_overflow(self):
# GH#12534, fixed by GH#19024
dt = Timestamp("1700-01-31")
td = Timedelta("20000 Days")
dti = pd.date_range("1949-09-30", freq="100Y", periods=4)
dti = date_range("1949-09-30", freq="100Y", periods=4)
ser = Series(dti)
msg = "Overflow in int64 addition"
with pytest.raises(OverflowError, match=msg):
Expand Down Expand Up @@ -1830,7 +1830,7 @@ def test_sub_single_tz(self):
def test_dt64tz_series_sub_dtitz(self):
# GH#19071 subtracting tzaware DatetimeIndex from tzaware Series
# (with same tz) raises, fixed by #19024
dti = pd.date_range("1999-09-30", periods=10, tz="US/Pacific")
dti = date_range("1999-09-30", periods=10, tz="US/Pacific")
ser = Series(dti)
expected = Series(TimedeltaIndex(["0days"] * 10))

Expand Down Expand Up @@ -2025,7 +2025,7 @@ class TestDatetimeIndexArithmetic:
def test_dti_addsub_int(self, tz_naive_fixture, one):
# Variants of `one` for #19012
tz = tz_naive_fixture
rng = pd.date_range("2000-01-01 09:00", freq="H", periods=10, tz=tz)
rng = date_range("2000-01-01 09:00", freq="H", periods=10, tz=tz)
msg = "Addition/subtraction of integers"

with pytest.raises(TypeError, match=msg):
Expand All @@ -2044,7 +2044,7 @@ def test_dti_addsub_int(self, tz_naive_fixture, one):
@pytest.mark.parametrize("int_holder", [np.array, pd.Index])
def test_dti_add_intarray_tick(self, int_holder, freq):
# GH#19959
dti = pd.date_range("2016-01-01", periods=2, freq=freq)
dti = date_range("2016-01-01", periods=2, freq=freq)
other = int_holder([4, -1])

msg = "Addition/subtraction of integers|cannot subtract DatetimeArray from"
Expand All @@ -2054,7 +2054,7 @@ def test_dti_add_intarray_tick(self, int_holder, freq):
@pytest.mark.parametrize("int_holder", [np.array, pd.Index])
def test_dti_add_intarray_non_tick(self, int_holder, freq):
# GH#19959
dti = pd.date_range("2016-01-01", periods=2, freq=freq)
dti = date_range("2016-01-01", periods=2, freq=freq)
other = int_holder([4, -1])

msg = "Addition/subtraction of integers|cannot subtract DatetimeArray from"
Expand All @@ -2078,7 +2078,7 @@ def test_dti_add_tdi(self, tz_naive_fixture):
tz = tz_naive_fixture
dti = DatetimeIndex([Timestamp("2017-01-01", tz=tz)] * 10)
tdi = pd.timedelta_range("0 days", periods=10)
expected = pd.date_range("2017-01-01", periods=10, tz=tz)
expected = date_range("2017-01-01", periods=10, tz=tz)
expected = expected._with_freq(None)

# add with TimdeltaIndex
Expand All @@ -2100,7 +2100,7 @@ def test_dti_iadd_tdi(self, tz_naive_fixture):
tz = tz_naive_fixture
dti = DatetimeIndex([Timestamp("2017-01-01", tz=tz)] * 10)
tdi = pd.timedelta_range("0 days", periods=10)
expected = pd.date_range("2017-01-01", periods=10, tz=tz)
expected = date_range("2017-01-01", periods=10, tz=tz)
expected = expected._with_freq(None)

# iadd with TimdeltaIndex
Expand All @@ -2126,7 +2126,7 @@ def test_dti_sub_tdi(self, tz_naive_fixture):
tz = tz_naive_fixture
dti = DatetimeIndex([Timestamp("2017-01-01", tz=tz)] * 10)
tdi = pd.timedelta_range("0 days", periods=10)
expected = pd.date_range("2017-01-01", periods=10, tz=tz, freq="-1D")
expected = date_range("2017-01-01", periods=10, tz=tz, freq="-1D")
expected = expected._with_freq(None)

# sub with TimedeltaIndex
Expand All @@ -2150,7 +2150,7 @@ def test_dti_isub_tdi(self, tz_naive_fixture):
tz = tz_naive_fixture
dti = DatetimeIndex([Timestamp("2017-01-01", tz=tz)] * 10)
tdi = pd.timedelta_range("0 days", periods=10)
expected = pd.date_range("2017-01-01", periods=10, tz=tz, freq="-1D")
expected = date_range("2017-01-01", periods=10, tz=tz, freq="-1D")
expected = expected._with_freq(None)

# isub with TimedeltaIndex
Expand Down Expand Up @@ -2431,7 +2431,7 @@ def test_dti_addsub_offset_arraylike(
other_box = index_or_series

tz = tz_naive_fixture
dti = pd.date_range("2017-01-01", periods=2, tz=tz, name=names[0])
dti = date_range("2017-01-01", periods=2, tz=tz, name=names[0])
other = other_box([pd.offsets.MonthEnd(), pd.offsets.Day(n=2)], name=names[1])

xbox = get_upcast_box(box, other)
Expand All @@ -2451,7 +2451,7 @@ def test_dti_addsub_object_arraylike(
):
tz = tz_naive_fixture

dti = pd.date_range("2017-01-01", periods=2, tz=tz)
dti = date_range("2017-01-01", periods=2, tz=tz)
dtarr = tm.box_expected(dti, box_with_array)
other = other_box([pd.offsets.MonthEnd(), Timedelta(days=4)])
xbox = get_upcast_box(box_with_array, other)
Expand Down Expand Up @@ -2497,7 +2497,7 @@ def test_shift_months(years, months):
def test_dt64arr_addsub_object_dtype_2d():
# block-wise DataFrame operations will require operating on 2D
# DatetimeArray/TimedeltaArray, so check that specifically.
dti = pd.date_range("1994-02-13", freq="2W", periods=4)
dti = date_range("1994-02-13", freq="2W", periods=4)
dta = dti._data.reshape((4, 1))

other = np.array([[pd.offsets.Day(n)] for n in range(4)])
Expand Down
Loading