Skip to content

Commit

Permalink
Merge pull request pandas-dev#10928 from qwhelan/asv_update
Browse files Browse the repository at this point in the history
Updates for asv suite
  • Loading branch information
jorisvandenbossche committed Aug 29, 2015
2 parents ba0704f + eac3fd8 commit 70607ba
Show file tree
Hide file tree
Showing 68 changed files with 2,251 additions and 1,930 deletions.
9 changes: 6 additions & 3 deletions asv_bench/asv.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
// If missing or the empty string, the tool will be automatically
// determined by looking for tools on the PATH environment
// variable.
"environment_type": "conda",
"environment_type": "",

// the base URL to show a commit for the project.
"show_commit_url": "https://github.com/pydata/pandas/commit/",

// The Pythons you'd like to test against. If not provided, defaults
// to the current version of Python used to run `asv`.
// "pythons": ["2.7", "3.4"],
"pythons": ["2.7"],
"pythons": ["2.7", "3.4"],

// The matrix of dependencies to test. Each key is the name of a
// package (in PyPI) and the values are version numbers. An empty
Expand All @@ -41,7 +41,10 @@
"sqlalchemy": [],
"scipy": [],
"numexpr": [],
"pytables": [],
"tables": [],
"openpyxl": [],
"xlrd": [],
"xlwt": []
},

// The directory (relative to the current directory) that benchmarks are
Expand Down
2 changes: 1 addition & 1 deletion asv_bench/benchmarks/attrs_caching.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from pandas_vb_common import *
from .pandas_vb_common import *


class getattr_dataframe_index(object):
Expand Down
2 changes: 1 addition & 1 deletion asv_bench/benchmarks/binary_ops.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from pandas_vb_common import *
from .pandas_vb_common import *
import pandas.computation.expressions as expr


Expand Down
2 changes: 1 addition & 1 deletion asv_bench/benchmarks/categoricals.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from pandas_vb_common import *
from .pandas_vb_common import *


class concat_categorical(object):
Expand Down
2 changes: 1 addition & 1 deletion asv_bench/benchmarks/ctors.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from pandas_vb_common import *
from .pandas_vb_common import *


class frame_constructor_ndarray(object):
Expand Down
4 changes: 2 additions & 2 deletions asv_bench/benchmarks/eval.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from pandas_vb_common import *
import pandas.computation.expressions as expr
from .pandas_vb_common import *
import pandas as pd
import pandas.computation.expressions as expr


class eval_frame_add_all_threads(object):
Expand Down
Loading

0 comments on commit 70607ba

Please sign in to comment.