Skip to content

Commit a61c12b

Browse files
committedSep 29, 2017
Merge recent changes from upstream
2 parents 7627e93 + 269e95e commit a61c12b

File tree

122 files changed

+3128
-2273
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+3128
-2273
lines changed
 

‎asv_bench/benchmarks/sparse.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from itertools import repeat
1+
import itertools
22

33
from .pandas_vb_common import *
44
import scipy.sparse
@@ -33,7 +33,7 @@ def time_sparse_from_scipy(self):
3333
SparseDataFrame(scipy.sparse.rand(1000, 1000, 0.005))
3434

3535
def time_sparse_from_dict(self):
36-
SparseDataFrame(dict(zip(range(1000), repeat([0]))))
36+
SparseDataFrame(dict(zip(range(1000), itertools.repeat([0]))))
3737

3838

3939
class sparse_series_from_coo(object):

‎asv_bench/benchmarks/timeseries.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def setup(self):
5656
self.no_freq = self.rng7[:50000].append(self.rng7[50002:])
5757
self.d_freq = self.rng7[:50000].append(self.rng7[50000:])
5858

59-
self.rng8 = date_range(start='1/1/1700', freq='B', periods=100000)
59+
self.rng8 = date_range(start='1/1/1700', freq='B', periods=75000)
6060
self.b_freq = self.rng8[:50000].append(self.rng8[50000:])
6161

6262
def time_add_timedelta(self):

0 commit comments

Comments
 (0)