Skip to content

Commit fd8e3e7

Browse files
mroeschkemroeschke
authored
CLN/TST: Use fixture instead of setup_method (#49004)
1 parent 582377f commit fd8e3e7

File tree

7 files changed

+294
-250
lines changed

7 files changed

+294
-250
lines changed

‎pandas/tests/frame/test_query_eval.py

+23-20
Original file line numberDiff line numberDiff line change
@@ -36,45 +36,48 @@ def skip_if_no_pandas_parser(parser):
3636

3737

3838
class TestCompat:
39-
def setup_method(self):
40-
self.df = DataFrame({"A": [1, 2, 3]})
41-
self.expected1 = self.df[self.df.A > 0]
42-
self.expected2 = self.df.A + 1
39+
@pytest.fixture
40+
def df(self):
41+
return DataFrame({"A": [1, 2, 3]})
42+
43+
@pytest.fixture
44+
def expected1(self, df):
45+
return df[df.A > 0]
46+
47+
@pytest.fixture
48+
def expected2(self, df):
49+
return df.A + 1
4350

44-
def test_query_default(self):
51+
def test_query_default(self, df, expected1, expected2):
4552

4653
# GH 12749
4754
# this should always work, whether NUMEXPR_INSTALLED or not
48-
df = self.df
4955
result = df.query("A>0")
50-
tm.assert_frame_equal(result, self.expected1)
56+
tm.assert_frame_equal(result, expected1)
5157
result = df.eval("A+1")
52-
tm.assert_series_equal(result, self.expected2, check_names=False)
58+
tm.assert_series_equal(result, expected2, check_names=False)
5359

54-
def test_query_None(self):
60+
def test_query_None(self, df, expected1, expected2):
5561

56-
df = self.df
5762
result = df.query("A>0", engine=None)
58-
tm.assert_frame_equal(result, self.expected1)
63+
tm.assert_frame_equal(result, expected1)
5964
result = df.eval("A+1", engine=None)
60-
tm.assert_series_equal(result, self.expected2, check_names=False)
65+
tm.assert_series_equal(result, expected2, check_names=False)
6166

62-
def test_query_python(self):
67+
def test_query_python(self, df, expected1, expected2):
6368

64-
df = self.df
6569
result = df.query("A>0", engine="python")
66-
tm.assert_frame_equal(result, self.expected1)
70+
tm.assert_frame_equal(result, expected1)
6771
result = df.eval("A+1", engine="python")
68-
tm.assert_series_equal(result, self.expected2, check_names=False)
72+
tm.assert_series_equal(result, expected2, check_names=False)
6973

70-
def test_query_numexpr(self):
74+
def test_query_numexpr(self, df, expected1, expected2):
7175

72-
df = self.df
7376
if NUMEXPR_INSTALLED:
7477
result = df.query("A>0", engine="numexpr")
75-
tm.assert_frame_equal(result, self.expected1)
78+
tm.assert_frame_equal(result, expected1)
7679
result = df.eval("A+1", engine="numexpr")
77-
tm.assert_series_equal(result, self.expected2, check_names=False)
80+
tm.assert_series_equal(result, expected2, check_names=False)
7881
else:
7982
msg = (
8083
r"'numexpr' is not installed or an unsupported version. "

‎pandas/tests/io/json/test_json_table_schema_ext_dtype.py

+33-20
Original file line numberDiff line numberDiff line change
@@ -111,23 +111,36 @@ def test_as_json_table_type_ext_integer_dtype(self):
111111

112112

113113
class TestTableOrient:
114-
def setup_method(self):
115-
self.da = DateArray([dt.date(2021, 10, 10)])
116-
self.dc = DecimalArray([decimal.Decimal(10)])
117-
self.sa = array(["pandas"], dtype="string")
118-
self.ia = array([10], dtype="Int64")
119-
self.df = DataFrame(
114+
@pytest.fixture
115+
def da(self):
116+
return DateArray([dt.date(2021, 10, 10)])
117+
118+
@pytest.fixture
119+
def dc(self):
120+
return DecimalArray([decimal.Decimal(10)])
121+
122+
@pytest.fixture
123+
def sa(self):
124+
return array(["pandas"], dtype="string")
125+
126+
@pytest.fixture
127+
def ia(self):
128+
return array([10], dtype="Int64")
129+
130+
@pytest.fixture
131+
def df(self, da, dc, sa, ia):
132+
return DataFrame(
120133
{
121-
"A": self.da,
122-
"B": self.dc,
123-
"C": self.sa,
124-
"D": self.ia,
134+
"A": da,
135+
"B": dc,
136+
"C": sa,
137+
"D": ia,
125138
}
126139
)
127140

128-
def test_build_date_series(self):
141+
def test_build_date_series(self, da):
129142

130-
s = Series(self.da, name="a")
143+
s = Series(da, name="a")
131144
s.index.name = "id"
132145
result = s.to_json(orient="table", date_format="iso")
133146
result = json.loads(result, object_pairs_hook=OrderedDict)
@@ -151,9 +164,9 @@ def test_build_date_series(self):
151164

152165
assert result == expected
153166

154-
def test_build_decimal_series(self):
167+
def test_build_decimal_series(self, dc):
155168

156-
s = Series(self.dc, name="a")
169+
s = Series(dc, name="a")
157170
s.index.name = "id"
158171
result = s.to_json(orient="table", date_format="iso")
159172
result = json.loads(result, object_pairs_hook=OrderedDict)
@@ -177,8 +190,8 @@ def test_build_decimal_series(self):
177190

178191
assert result == expected
179192

180-
def test_build_string_series(self):
181-
s = Series(self.sa, name="a")
193+
def test_build_string_series(self, sa):
194+
s = Series(sa, name="a")
182195
s.index.name = "id"
183196
result = s.to_json(orient="table", date_format="iso")
184197
result = json.loads(result, object_pairs_hook=OrderedDict)
@@ -202,8 +215,8 @@ def test_build_string_series(self):
202215

203216
assert result == expected
204217

205-
def test_build_int64_series(self):
206-
s = Series(self.ia, name="a")
218+
def test_build_int64_series(self, ia):
219+
s = Series(ia, name="a")
207220
s.index.name = "id"
208221
result = s.to_json(orient="table", date_format="iso")
209222
result = json.loads(result, object_pairs_hook=OrderedDict)
@@ -227,9 +240,9 @@ def test_build_int64_series(self):
227240

228241
assert result == expected
229242

230-
def test_to_json(self):
243+
def test_to_json(self, df):
231244

232-
df = self.df.copy()
245+
df = df.copy()
233246
df.index.name = "idx"
234247
result = df.to_json(orient="table", date_format="iso")
235248
result = json.loads(result, object_pairs_hook=OrderedDict)

‎pandas/tests/plotting/test_converter.py

+27-23
Original file line numberDiff line numberDiff line change
@@ -287,66 +287,70 @@ def test_convert_nested(self, dtc):
287287

288288

289289
class TestPeriodConverter:
290-
def setup_method(self):
291-
self.pc = converter.PeriodConverter()
290+
@pytest.fixture
291+
def pc(self):
292+
return converter.PeriodConverter()
292293

294+
@pytest.fixture
295+
def axis(self):
293296
class Axis:
294297
pass
295298

296-
self.axis = Axis()
297-
self.axis.freq = "D"
299+
axis = Axis()
300+
axis.freq = "D"
301+
return axis
298302

299-
def test_convert_accepts_unicode(self):
300-
r1 = self.pc.convert("2012-1-1", None, self.axis)
301-
r2 = self.pc.convert("2012-1-1", None, self.axis)
303+
def test_convert_accepts_unicode(self, pc, axis):
304+
r1 = pc.convert("2012-1-1", None, axis)
305+
r2 = pc.convert("2012-1-1", None, axis)
302306
assert r1 == r2
303307

304-
def test_conversion(self):
305-
rs = self.pc.convert(["2012-1-1"], None, self.axis)[0]
308+
def test_conversion(self, pc, axis):
309+
rs = pc.convert(["2012-1-1"], None, axis)[0]
306310
xp = Period("2012-1-1").ordinal
307311
assert rs == xp
308312

309-
rs = self.pc.convert("2012-1-1", None, self.axis)
313+
rs = pc.convert("2012-1-1", None, axis)
310314
assert rs == xp
311315

312-
rs = self.pc.convert([date(2012, 1, 1)], None, self.axis)[0]
316+
rs = pc.convert([date(2012, 1, 1)], None, axis)[0]
313317
assert rs == xp
314318

315-
rs = self.pc.convert(date(2012, 1, 1), None, self.axis)
319+
rs = pc.convert(date(2012, 1, 1), None, axis)
316320
assert rs == xp
317321

318-
rs = self.pc.convert([Timestamp("2012-1-1")], None, self.axis)[0]
322+
rs = pc.convert([Timestamp("2012-1-1")], None, axis)[0]
319323
assert rs == xp
320324

321-
rs = self.pc.convert(Timestamp("2012-1-1"), None, self.axis)
325+
rs = pc.convert(Timestamp("2012-1-1"), None, axis)
322326
assert rs == xp
323327

324-
rs = self.pc.convert("2012-01-01", None, self.axis)
328+
rs = pc.convert("2012-01-01", None, axis)
325329
assert rs == xp
326330

327-
rs = self.pc.convert("2012-01-01 00:00:00+0000", None, self.axis)
331+
rs = pc.convert("2012-01-01 00:00:00+0000", None, axis)
328332
assert rs == xp
329333

330-
rs = self.pc.convert(
334+
rs = pc.convert(
331335
np.array(
332336
["2012-01-01 00:00:00", "2012-01-02 00:00:00"],
333337
dtype="datetime64[ns]",
334338
),
335339
None,
336-
self.axis,
340+
axis,
337341
)
338342
assert rs[0] == xp
339343

340-
def test_integer_passthrough(self):
344+
def test_integer_passthrough(self, pc, axis):
341345
# GH9012
342-
rs = self.pc.convert([0, 1], None, self.axis)
346+
rs = pc.convert([0, 1], None, axis)
343347
xp = [0, 1]
344348
assert rs == xp
345349

346-
def test_convert_nested(self):
350+
def test_convert_nested(self, pc, axis):
347351
data = ["2012-1-1", "2012-1-2"]
348-
r1 = self.pc.convert([data, data], None, self.axis)
349-
r2 = [self.pc.convert(data, None, self.axis) for _ in range(2)]
352+
r1 = pc.convert([data, data], None, axis)
353+
r2 = [pc.convert(data, None, axis) for _ in range(2)]
350354
assert r1 == r2
351355

352356

0 commit comments

Comments
 (0)