Skip to content

Support for OO Optimization #21093

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.

Sign up for GitHub

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 21 commits into from
May 30, 2018
Merged

Support for OO Optimization #21093

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
840eec8
Added test case
WillAyd May 16, 2018
19e71e3
Conditionals for -OO optimization support
WillAyd May 16, 2018
95826d3
Updated test name
WillAyd May 16, 2018
0e48c18
Py27 Compat
WillAyd May 16, 2018
2248137
Merge remote-tracking branch 'upstream/master' into oo-import
WillAyd May 20, 2018
abdc5f2
Leveraged docstring substitution
WillAyd May 20, 2018
e4ba948
Updated docstring for deprecate wrapper
WillAyd May 20, 2018
021786b
Whatsnew note
WillAyd May 20, 2018
a1b409d
Reverted class Substitution in offsets.py
WillAyd May 24, 2018
a89c4f4
Recursive OO support
WillAyd May 24, 2018
078610a
LINT fixup
WillAyd May 24, 2018
91a2226
Merge remote-tracking branch 'upstream/master' into oo-import
WillAyd May 24, 2018
c697dae
Updated whatsnew
WillAyd May 24, 2018
d6c66ec
Reverted recursive import test
WillAyd May 25, 2018
c853c67
Merge remote-tracking branch 'upstream/master' into oo-import
WillAyd May 25, 2018
c825636
Reverted conftest / decorators to master
WillAyd May 25, 2018
f8ccfa0
Removed errant Categorical section in whatsnew
WillAyd May 25, 2018
e427f4b
LINT fixup
WillAyd May 25, 2018
46a2f6a
Merge remote-tracking branch 'upstream/master' into oo-import
WillAyd May 29, 2018
a2e748a
Updated TODO comments
WillAyd May 29, 2018
75dbaad
Fixed decorate docstring wrapper
WillAyd May 29, 2018
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
7 changes: 7 additions & 0 deletions pandas/tests/test_downstream.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
"""
Testing that we work in the downstream packages
"""
import subprocess

import pytest
import numpy as np # noqa
from pandas import DataFrame
Expand Down Expand Up @@ -53,6 +55,11 @@ def test_xarray(df):
assert df.to_xarray() is not None


def test_oo_optimizable():
# GH 21071
subprocess.check_call(["python", "-OO", "-c", "import pandas"])
Copy link

Choose a reason for hiding this comment

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

Does pandas import all modules at import pandas? If not, maybe this will be helpful.

Copy link
Member

Choose a reason for hiding this comment

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

@WillAyd do we want to go this way to also check some submodules?

Copy link
Member Author

Choose a reason for hiding this comment

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

I can take a look - if it's not a lot of effort I suppose it doesn't hurt

Copy link
Member Author

Choose a reason for hiding this comment

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

I've been messing around with this for a bit but AFAICT it keeps getting choked up when trying to import modules containing optional dependencies (ex: pandas.io.s3). I can't think of a simple way to configure the test so that it can differentiate intentional ImportErrors as a result of missing dependencies.

For now I'm going to revert to just working with the top level import - can open a separate issue if we wanted this to work recursively

Copy link
Member

Choose a reason for hiding this comment

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

Yep, if it turns out difficult, on problem in starting with the basic test (which already tests the large majority of our API)



@tm.network
def test_statsmodels():

Expand Down
7 changes: 5 additions & 2 deletions pandas/tseries/offsets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1090,12 +1090,15 @@ def apply(self, other):


class CustomBusinessMonthEnd(_CustomBusinessMonth):
__doc__ = _CustomBusinessMonth.__doc__.replace('[BEGIN/END]', 'end')
if _CustomBusinessMonth.__doc__:
__doc__ = _CustomBusinessMonth.__doc__.replace('[BEGIN/END]', 'end')
_prefix = 'CBM'


class CustomBusinessMonthBegin(_CustomBusinessMonth):
Copy link
Contributor

Choose a reason for hiding this comment

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

I think better to do this with @subsitution and template this. We dont' use this pattern anywhere and might be confusing.

Copy link
Member Author

Choose a reason for hiding this comment

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

Makes sense - I'll take a look and repush

__doc__ = _CustomBusinessMonth.__doc__.replace('[BEGIN/END]', 'beginning')
if _CustomBusinessMonth.__doc__:
__doc__ = _CustomBusinessMonth.__doc__.replace('[BEGIN/END]',
'beginning')
_prefix = 'CBMS'


Expand Down
9 changes: 5 additions & 4 deletions pandas/util/_decorators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,11 @@ def wrapper(*args, **kwargs):
{rest}
""")
rest = getattr(wrapper, '__doc__', '')
docstring = tpl.format(version=version,
msg='\n '.join(wrap(msg, 70)),
rest=dedent(rest))
wrapper.__doc__ = docstring
if rest:
docstring = tpl.format(version=version,
msg='\n '.join(wrap(msg, 70)),
rest=dedent(rest))
wrapper.__doc__ = docstring

return wrapper

Expand Down