Skip to content

Commit 09fb8e5

Browse files
authored
TST/CLN: Remove make_rand_series (#56163)
* TST/CLN: Remove make_rand_series * Remove old usages * Adjust test
1 parent 20ce643 commit 09fb8e5

16 files changed

+59
-59
lines changed

pandas/_testing/__init__.py

-20
Original file line numberDiff line numberDiff line change
@@ -456,23 +456,6 @@ def makePeriodIndex(k: int = 10, name=None, **kwargs) -> PeriodIndex:
456456
return pi
457457

458458

459-
# make series
460-
def make_rand_series(name=None, dtype=np.float64) -> Series:
461-
index = makeStringIndex(_N)
462-
data = np.random.default_rng(2).standard_normal(_N)
463-
with np.errstate(invalid="ignore"):
464-
data = data.astype(dtype, copy=False)
465-
return Series(data, index=index, name=name)
466-
467-
468-
def makeFloatSeries(name=None) -> Series:
469-
return make_rand_series(name=name)
470-
471-
472-
def makeStringSeries(name=None) -> Series:
473-
return make_rand_series(name=name)
474-
475-
476459
def makeObjectSeries(name=None) -> Series:
477460
data = makeStringIndex(_N)
478461
data = Index(data, dtype=object)
@@ -1073,16 +1056,13 @@ def shares_memory(left, right) -> bool:
10731056
"makeDataFrame",
10741057
"makeDateIndex",
10751058
"makeFloatIndex",
1076-
"makeFloatSeries",
10771059
"makeIntIndex",
10781060
"makeMixedDataFrame",
10791061
"makeNumericIndex",
10801062
"makeObjectSeries",
10811063
"makePeriodIndex",
1082-
"make_rand_series",
10831064
"makeRangeIndex",
10841065
"makeStringIndex",
1085-
"makeStringSeries",
10861066
"makeTimeDataFrame",
10871067
"makeTimedeltaIndex",
10881068
"makeTimeSeries",

pandas/conftest.py

+8-4
Original file line numberDiff line numberDiff line change
@@ -729,9 +729,11 @@ def string_series() -> Series:
729729
"""
730730
Fixture for Series of floats with Index of unique strings
731731
"""
732-
s = tm.makeStringSeries()
733-
s.name = "series"
734-
return s
732+
return Series(
733+
np.arange(30, dtype=np.float64) * 1.1,
734+
index=Index([f"i_{i}" for i in range(30)], dtype=object),
735+
name="series",
736+
)
735737

736738

737739
@pytest.fixture
@@ -776,7 +778,9 @@ def series_with_simple_index(index) -> Series:
776778

777779

778780
_narrow_series = {
779-
f"{dtype.__name__}-series": tm.make_rand_series(name="a", dtype=dtype)
781+
f"{dtype.__name__}-series": Series(
782+
range(30), index=[f"i-{i}" for i in range(30)], name="a", dtype=dtype
783+
)
780784
for dtype in tm.NARROW_NP_DTYPES
781785
}
782786

pandas/tests/apply/test_invalid_arg.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -338,11 +338,8 @@ def test_transform_wont_agg_series(string_series, func):
338338
# we are trying to transform with an aggregator
339339
msg = "Function did not transform"
340340

341-
warn = RuntimeWarning if func[0] == "sqrt" else None
342-
warn_msg = "invalid value encountered in sqrt"
343341
with pytest.raises(ValueError, match=msg):
344-
with tm.assert_produces_warning(warn, match=warn_msg, check_stacklevel=False):
345-
string_series.transform(func)
342+
string_series.transform(func)
346343

347344

348345
@pytest.mark.parametrize(

pandas/tests/base/test_misc.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ def test_memory_usage_components_series(series_with_simple_index):
132132

133133
@pytest.mark.parametrize("dtype", tm.NARROW_NP_DTYPES)
134134
def test_memory_usage_components_narrow_series(dtype):
135-
series = tm.make_rand_series(name="a", dtype=dtype)
135+
series = Series(range(5), dtype=dtype, index=[f"i-{i}" for i in range(5)], name="a")
136136
total_usage = series.memory_usage(index=True)
137137
non_index_usage = series.memory_usage(index=False)
138138
index_usage = series.index.memory_usage()

pandas/tests/dtypes/test_missing.py

-2
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@ def test_notna_notnull(notna_f):
7878
@pytest.mark.parametrize(
7979
"ser",
8080
[
81-
tm.makeFloatSeries(),
82-
tm.makeStringSeries(),
8381
tm.makeObjectSeries(),
8482
tm.makeTimeSeries(),
8583
Series(range(5), period_range("2020-01-01", periods=5)),

pandas/tests/generic/test_generic.py

+16-4
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,11 @@ class TestNDFrame:
316316
# tests that don't fit elsewhere
317317

318318
@pytest.mark.parametrize(
319-
"ser", [tm.makeFloatSeries(), tm.makeStringSeries(), tm.makeObjectSeries()]
319+
"ser",
320+
[
321+
Series(range(10), dtype=np.float64),
322+
Series([str(i) for i in range(10)], dtype=object),
323+
],
320324
)
321325
def test_squeeze_series_noop(self, ser):
322326
# noop
@@ -360,14 +364,18 @@ def test_squeeze_axis_len_3(self):
360364
tm.assert_frame_equal(df.squeeze(axis=0), df)
361365

362366
def test_numpy_squeeze(self):
363-
s = tm.makeFloatSeries()
367+
s = Series(range(2), dtype=np.float64)
364368
tm.assert_series_equal(np.squeeze(s), s)
365369

366370
df = tm.makeTimeDataFrame().reindex(columns=["A"])
367371
tm.assert_series_equal(np.squeeze(df), df["A"])
368372

369373
@pytest.mark.parametrize(
370-
"ser", [tm.makeFloatSeries(), tm.makeStringSeries(), tm.makeObjectSeries()]
374+
"ser",
375+
[
376+
Series(range(10), dtype=np.float64),
377+
Series([str(i) for i in range(10)], dtype=object),
378+
],
371379
)
372380
def test_transpose_series(self, ser):
373381
# calls implementation in pandas/core/base.py
@@ -393,7 +401,11 @@ def test_numpy_transpose(self, frame_or_series):
393401
np.transpose(obj, axes=1)
394402

395403
@pytest.mark.parametrize(
396-
"ser", [tm.makeFloatSeries(), tm.makeStringSeries(), tm.makeObjectSeries()]
404+
"ser",
405+
[
406+
Series(range(10), dtype=np.float64),
407+
Series([str(i) for i in range(10)], dtype=object),
408+
],
397409
)
398410
def test_take_series(self, ser):
399411
indices = [1, 5, -2, 6, 3, -1]

pandas/tests/io/pytables/test_append.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def test_append(setup_path):
9999
def test_append_series(setup_path):
100100
with ensure_clean_store(setup_path) as store:
101101
# basic
102-
ss = tm.makeStringSeries()
102+
ss = Series(range(20), dtype=np.float64, index=[f"i_{i}" for i in range(20)])
103103
ts = tm.makeTimeSeries()
104104
ns = Series(np.arange(100))
105105

pandas/tests/io/pytables/test_keys.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
from pandas import (
44
DataFrame,
55
HDFStore,
6+
Series,
67
_testing as tm,
78
)
89
from pandas.tests.io.pytables.common import (
@@ -16,7 +17,9 @@
1617
def test_keys(setup_path):
1718
with ensure_clean_store(setup_path) as store:
1819
store["a"] = tm.makeTimeSeries()
19-
store["b"] = tm.makeStringSeries()
20+
store["b"] = Series(
21+
range(10), dtype="float64", index=[f"i_{i}" for i in range(10)]
22+
)
2023
store["c"] = tm.makeDataFrame()
2124

2225
assert len(store) == 3

pandas/tests/io/pytables/test_read.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ def test_read_hdf_series_mode_r(tmp_path, format, setup_path):
356356
# GH 16583
357357
# Tests that reading a Series saved to an HDF file
358358
# still works if a mode='r' argument is supplied
359-
series = tm.makeFloatSeries()
359+
series = Series(range(10), dtype=np.float64)
360360
path = tmp_path / setup_path
361361
series.to_hdf(path, key="data", format=format)
362362
result = read_hdf(path, key="data", mode="r")

pandas/tests/io/pytables/test_round_trip.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def roundtrip(key, obj, **kwargs):
3636
o = tm.makeTimeSeries()
3737
tm.assert_series_equal(o, roundtrip("series", o))
3838

39-
o = tm.makeStringSeries()
39+
o = Series(range(10), dtype="float64", index=[f"i_{i}" for i in range(10)])
4040
tm.assert_series_equal(o, roundtrip("string_series", o))
4141

4242
o = tm.makeDataFrame()
@@ -249,7 +249,7 @@ def test_table_values_dtypes_roundtrip(setup_path):
249249

250250
@pytest.mark.filterwarnings("ignore::pandas.errors.PerformanceWarning")
251251
def test_series(setup_path):
252-
s = tm.makeStringSeries()
252+
s = Series(range(10), dtype="float64", index=[f"i_{i}" for i in range(10)])
253253
_check_roundtrip(s, tm.assert_series_equal, path=setup_path)
254254

255255
ts = tm.makeTimeSeries()

pandas/tests/io/pytables/test_store.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,9 @@ def test_repr(setup_path):
103103
repr(store)
104104
store.info()
105105
store["a"] = tm.makeTimeSeries()
106-
store["b"] = tm.makeStringSeries()
106+
store["b"] = Series(
107+
range(10), dtype="float64", index=[f"i_{i}" for i in range(10)]
108+
)
107109
store["c"] = tm.makeDataFrame()
108110

109111
df = tm.makeDataFrame()

pandas/tests/plotting/test_series.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ def ts():
4343

4444
@pytest.fixture
4545
def series():
46-
return tm.makeStringSeries(name="series")
46+
return Series(
47+
range(20), dtype=np.float64, name="series", index=[f"i_{i}" for i in range(20)]
48+
)
4749

4850

4951
class TestSeriesPlots:

pandas/tests/reductions/test_reductions.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -868,7 +868,7 @@ def test_idxmin_dt64index(self, unit):
868868
def test_idxmin(self):
869869
# test idxmin
870870
# _check_stat_op approach can not be used here because of isna check.
871-
string_series = tm.makeStringSeries().rename("series")
871+
string_series = Series(range(20), dtype=np.float64, name="series")
872872

873873
# add some NaNs
874874
string_series[5:15] = np.nan
@@ -901,7 +901,7 @@ def test_idxmin(self):
901901
def test_idxmax(self):
902902
# test idxmax
903903
# _check_stat_op approach can not be used here because of isna check.
904-
string_series = tm.makeStringSeries().rename("series")
904+
string_series = Series(range(20), dtype=np.float64, name="series")
905905

906906
# add some NaNs
907907
string_series[5:15] = np.nan

pandas/tests/reductions/test_stat_reductions.py

+10-10
Original file line numberDiff line numberDiff line change
@@ -154,35 +154,35 @@ def _check_stat_op(
154154
f(string_series_, numeric_only=True)
155155

156156
def test_sum(self):
157-
string_series = tm.makeStringSeries().rename("series")
157+
string_series = Series(range(20), dtype=np.float64, name="series")
158158
self._check_stat_op("sum", np.sum, string_series, check_allna=False)
159159

160160
def test_mean(self):
161-
string_series = tm.makeStringSeries().rename("series")
161+
string_series = Series(range(20), dtype=np.float64, name="series")
162162
self._check_stat_op("mean", np.mean, string_series)
163163

164164
def test_median(self):
165-
string_series = tm.makeStringSeries().rename("series")
165+
string_series = Series(range(20), dtype=np.float64, name="series")
166166
self._check_stat_op("median", np.median, string_series)
167167

168168
# test with integers, test failure
169169
int_ts = Series(np.ones(10, dtype=int), index=range(10))
170170
tm.assert_almost_equal(np.median(int_ts), int_ts.median())
171171

172172
def test_prod(self):
173-
string_series = tm.makeStringSeries().rename("series")
173+
string_series = Series(range(20), dtype=np.float64, name="series")
174174
self._check_stat_op("prod", np.prod, string_series)
175175

176176
def test_min(self):
177-
string_series = tm.makeStringSeries().rename("series")
177+
string_series = Series(range(20), dtype=np.float64, name="series")
178178
self._check_stat_op("min", np.min, string_series, check_objects=True)
179179

180180
def test_max(self):
181-
string_series = tm.makeStringSeries().rename("series")
181+
string_series = Series(range(20), dtype=np.float64, name="series")
182182
self._check_stat_op("max", np.max, string_series, check_objects=True)
183183

184184
def test_var_std(self):
185-
string_series = tm.makeStringSeries().rename("series")
185+
string_series = Series(range(20), dtype=np.float64, name="series")
186186
datetime_series = tm.makeTimeSeries().rename("ts")
187187

188188
alt = lambda x: np.std(x, ddof=1)
@@ -208,7 +208,7 @@ def test_var_std(self):
208208
assert pd.isna(result)
209209

210210
def test_sem(self):
211-
string_series = tm.makeStringSeries().rename("series")
211+
string_series = Series(range(20), dtype=np.float64, name="series")
212212
datetime_series = tm.makeTimeSeries().rename("ts")
213213

214214
alt = lambda x: np.std(x, ddof=1) / np.sqrt(len(x))
@@ -228,7 +228,7 @@ def test_sem(self):
228228
def test_skew(self):
229229
sp_stats = pytest.importorskip("scipy.stats")
230230

231-
string_series = tm.makeStringSeries().rename("series")
231+
string_series = Series(range(20), dtype=np.float64, name="series")
232232

233233
alt = lambda x: sp_stats.skew(x, bias=False)
234234
self._check_stat_op("skew", alt, string_series)
@@ -250,7 +250,7 @@ def test_skew(self):
250250
def test_kurt(self):
251251
sp_stats = pytest.importorskip("scipy.stats")
252252

253-
string_series = tm.makeStringSeries().rename("series")
253+
string_series = Series(range(20), dtype=np.float64, name="series")
254254

255255
alt = lambda x: sp_stats.kurtosis(x, bias=False)
256256
self._check_stat_op("kurt", alt, string_series)

pandas/tests/series/test_arithmetic.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,11 @@ class TestSeriesFlexArithmetic:
4747
(lambda x: x, lambda x: x * 2, False),
4848
(lambda x: x, lambda x: x[::2], False),
4949
(lambda x: x, lambda x: 5, True),
50-
(lambda x: tm.makeFloatSeries(), lambda x: tm.makeFloatSeries(), True),
50+
(
51+
lambda x: Series(range(10), dtype=np.float64),
52+
lambda x: Series(range(10), dtype=np.float64),
53+
True,
54+
),
5155
],
5256
)
5357
@pytest.mark.parametrize(

pandas/tests/series/test_unary.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,11 @@ class TestSeriesUnaryOps:
88
# __neg__, __pos__, __invert__
99

1010
def test_neg(self):
11-
ser = tm.makeStringSeries()
12-
ser.name = "series"
11+
ser = Series(range(5), dtype="float64", name="series")
1312
tm.assert_series_equal(-ser, -1 * ser)
1413

1514
def test_invert(self):
16-
ser = tm.makeStringSeries()
17-
ser.name = "series"
15+
ser = Series(range(5), dtype="float64", name="series")
1816
tm.assert_series_equal(-(ser < 0), ~(ser < 0))
1917

2018
@pytest.mark.parametrize(

0 commit comments

Comments
 (0)