Skip to content

Commit 247b4e2

Browse files
Revert "Added some asv benchmarks teardown functions (pandas-dev#17616)"
1 parent 0e42b1f commit 247b4e2

File tree

3 files changed

+29
-46
lines changed

3 files changed

+29
-46
lines changed

asv_bench/benchmarks/hdfstore_bench.py

-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ def setup(self):
4040

4141
def teardown(self):
4242
self.store.close()
43-
self.remove(self.f)
4443

4544
def remove(self, f):
4645
try:
@@ -116,7 +115,6 @@ def setup(self):
116115

117116
def teardown(self):
118117
self.store.close()
119-
self.remove(self.f)
120118

121119
def remove(self, f):
122120
try:

asv_bench/benchmarks/io_bench.py

+9-37
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,16 @@
1010

1111
class frame_to_csv(object):
1212
goal_time = 0.2
13-
fname = '__test__.csv'
1413

1514
def setup(self):
1615
self.df = DataFrame(np.random.randn(3000, 30))
1716

1817
def time_frame_to_csv(self):
19-
self.df.to_csv(self.fname)
20-
21-
def teardown(self):
22-
os.remove(self.fname)
18+
self.df.to_csv('__test__.csv')
2319

2420

2521
class frame_to_csv2(object):
2622
goal_time = 0.2
27-
fname = '__test__.csv'
2823

2924
def setup(self):
3025
self.df = DataFrame({'A': range(50000), })
@@ -33,30 +28,22 @@ def setup(self):
3328
self.df['D'] = (self.df.A + 3.0)
3429

3530
def time_frame_to_csv2(self):
36-
self.df.to_csv(self.fname)
37-
38-
def teardown(self):
39-
os.remove(self.fname)
31+
self.df.to_csv('__test__.csv')
4032

4133

4234
class frame_to_csv_date_formatting(object):
4335
goal_time = 0.2
44-
fname = '__test__.csv'
4536

4637
def setup(self):
4738
self.rng = date_range('1/1/2000', periods=1000)
4839
self.data = DataFrame(self.rng, index=self.rng)
4940

5041
def time_frame_to_csv_date_formatting(self):
51-
self.data.to_csv(self.fname, date_format='%Y%m%d')
52-
53-
def teardown(self):
54-
os.remove(self.fname)
42+
self.data.to_csv('__test__.csv', date_format='%Y%m%d')
5543

5644

5745
class frame_to_csv_mixed(object):
5846
goal_time = 0.2
59-
fname = '__test__.csv'
6047

6148
def setup(self):
6249
self.df_float = DataFrame(np.random.randn(5000, 5), dtype='float64', columns=self.create_cols('float'))
@@ -68,14 +55,11 @@ def setup(self):
6855
self.df = concat([self.df_float, self.df_int, self.df_bool, self.df_object, self.df_dt], axis=1)
6956

7057
def time_frame_to_csv_mixed(self):
71-
self.df.to_csv(self.fname)
58+
self.df.to_csv('__test__.csv')
7259

7360
def create_cols(self, name):
7461
return [('%s%03d' % (name, i)) for i in range(5)]
7562

76-
def teardown(self):
77-
os.remove(self.fname)
78-
7963

8064
class read_csv_infer_datetime_format_custom(object):
8165
goal_time = 0.2
@@ -112,34 +96,26 @@ def time_read_csv_infer_datetime_format_ymd(self):
11296

11397
class read_csv_skiprows(object):
11498
goal_time = 0.2
115-
fname = '__test__.csv'
11699

117100
def setup(self):
118101
self.index = tm.makeStringIndex(20000)
119102
self.df = DataFrame({'float1': randn(20000), 'float2': randn(20000), 'string1': (['foo'] * 20000), 'bool1': ([True] * 20000), 'int1': np.random.randint(0, 200000, size=20000), }, index=self.index)
120-
self.df.to_csv(self.fname)
103+
self.df.to_csv('__test__.csv')
121104

122105
def time_read_csv_skiprows(self):
123-
read_csv(self.fname, skiprows=10000)
124-
125-
def teardown(self):
126-
os.remove(self.fname)
106+
read_csv('__test__.csv', skiprows=10000)
127107

128108

129109
class read_csv_standard(object):
130110
goal_time = 0.2
131-
fname = '__test__.csv'
132111

133112
def setup(self):
134113
self.index = tm.makeStringIndex(10000)
135114
self.df = DataFrame({'float1': randn(10000), 'float2': randn(10000), 'string1': (['foo'] * 10000), 'bool1': ([True] * 10000), 'int1': np.random.randint(0, 100000, size=10000), }, index=self.index)
136-
self.df.to_csv(self.fname)
115+
self.df.to_csv('__test__.csv')
137116

138117
def time_read_csv_standard(self):
139-
read_csv(self.fname)
140-
141-
def teardown(self):
142-
os.remove(self.fname)
118+
read_csv('__test__.csv')
143119

144120

145121
class read_parse_dates_iso8601(object):
@@ -178,17 +154,13 @@ def time_read_uint64_na_values(self):
178154

179155
class write_csv_standard(object):
180156
goal_time = 0.2
181-
fname = '__test__.csv'
182157

183158
def setup(self):
184159
self.index = tm.makeStringIndex(10000)
185160
self.df = DataFrame({'float1': randn(10000), 'float2': randn(10000), 'string1': (['foo'] * 10000), 'bool1': ([True] * 10000), 'int1': np.random.randint(0, 100000, size=10000), }, index=self.index)
186161

187162
def time_write_csv_standard(self):
188-
self.df.to_csv(self.fname)
189-
190-
def teardown(self):
191-
os.remove(self.fname)
163+
self.df.to_csv('__test__.csv')
192164

193165

194166
class read_csv_from_s3(object):

asv_bench/benchmarks/packers.py

+20-7
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import numpy as np
1010
from random import randrange
1111

12-
1312
class _Packers(object):
1413
goal_time = 0.2
1514

@@ -29,11 +28,8 @@ def remove(self, f):
2928
except:
3029
pass
3130

32-
def teardown(self):
33-
self.remove(self.f)
34-
35-
3631
class Packers(_Packers):
32+
goal_time = 0.2
3733

3834
def setup(self):
3935
self._setup()
@@ -42,8 +38,8 @@ def setup(self):
4238
def time_packers_read_csv(self):
4339
pd.read_csv(self.f)
4440

45-
4641
class packers_read_excel(_Packers):
42+
goal_time = 0.2
4743

4844
def setup(self):
4945
self._setup()
@@ -58,6 +54,7 @@ def time_packers_read_excel(self):
5854

5955

6056
class packers_read_hdf_store(_Packers):
57+
goal_time = 0.2
6158

6259
def setup(self):
6360
self._setup()
@@ -118,7 +115,6 @@ def setup(self):
118115
def time_packers_read_pickle(self):
119116
pd.read_pickle(self.f)
120117

121-
122118
class packers_read_sql(_Packers):
123119

124120
def setup(self):
@@ -181,6 +177,9 @@ def setup(self):
181177
def time_write_csv(self):
182178
self.df.to_csv(self.f)
183179

180+
def teardown(self):
181+
self.remove(self.f)
182+
184183

185184
class Excel(_Packers):
186185

@@ -218,6 +217,8 @@ def time_write_hdf_store(self):
218217
def time_write_hdf_table(self):
219218
self.df2.to_hdf(self.f, 'df', table=True)
220219

220+
def teardown(self):
221+
self.remove(self.f)
221222

222223
class JSON(_Packers):
223224

@@ -258,6 +259,9 @@ def time_write_json_mixed_float_int_str(self):
258259
def time_write_json_lines(self):
259260
self.df.to_json(self.f, orient="records", lines=True)
260261

262+
def teardown(self):
263+
self.remove(self.f)
264+
261265

262266
class MsgPack(_Packers):
263267

@@ -267,6 +271,9 @@ def setup(self):
267271
def time_write_msgpack(self):
268272
self.df2.to_msgpack(self.f)
269273

274+
def teardown(self):
275+
self.remove(self.f)
276+
270277

271278
class Pickle(_Packers):
272279

@@ -276,6 +283,9 @@ def setup(self):
276283
def time_write_pickle(self):
277284
self.df2.to_pickle(self.f)
278285

286+
def teardown(self):
287+
self.remove(self.f)
288+
279289

280290
class SQL(_Packers):
281291

@@ -303,3 +313,6 @@ def time_write_stata(self):
303313

304314
def time_write_stata_with_validation(self):
305315
self.df3.to_stata(self.f, {'index': 'tc', })
316+
317+
def teardown(self):
318+
self.remove(self.f)

0 commit comments

Comments
 (0)