fix some benchmarks

Author: mroeschke

.travis.yml

@@ -135,7 +135,7 @@ script:
   - ci/script_single.sh
   - ci/script_multi.sh
   - ci/lint.sh
-  - travis_wait 50 ci/asv.sh
+  - ci/asv.sh
   - echo "checking imports"
   - source activate pandas && python ci/check_imports.py
   - echo "script done"

asv_bench/benchmarks/reindex.py

@@ -167,10 +167,6 @@ def setup(self):
         col_array2 = col_array.copy()
         col_array2[:, :10000] = np.nan
         self.col_array_list = list(col_array)
-        self.col_array_list2 = list(col_array2)
 
     def time_lib_fast_zip(self):
         lib.fast_zip(self.col_array_list)
-
-    def time_lib_fast_zip_fillna(self):
-        lib.fast_zip_fillna(self.col_array_list2)

asv_bench/benchmarks/reshape.py

@@ -104,9 +104,9 @@ def setup(self):
         self.letters = list('ABCD')
         yrvars = [l + str(num)
                   for l, num in product(self.letters, range(1, nyrs + 1))]
-
+        columns = [str(i) for i in range(nidvars)] + yrvars
         self.df = DataFrame(np.random.randn(N, nidvars + len(yrvars)),
-                            columns=list(range(nidvars)) + yrvars)
+                            columns=columns)
         self.df['id'] = self.df.index
 
     def time_wide_to_long_big(self):