Skip to content

Updates for asv suite #10928

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 29, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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": [],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you change pytables to tables? It doesn't work for me know with conda. It ask if I meant pytables.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@RafalSkolasinski Looks like Anaconda changed the package name - it's on PyPI as tables: https://pypi.python.org/pypi/tables . I didn't want to force people to use conda or virtualenv, but I don't see an easy way to support both due to this name change.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@qwhelan I see... That's weird that package is named tables in pypi. even original webpage reads http://www.pytables.org/

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but the 'import name' is tables I think.

In any case, we are probably not going to be able to specify a fully correct asv.conf.json file (eg also for windows an extra entry has to be added). So I would propose to choose one case (I would say: conda on linux) and make it work for that, and then clearly explain in the docs or readme what has to be changed to use it in the other cases.

"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