Skip to content
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

REF/TYP: use OpsMixin for DataFrame #37044

Merged
merged 24 commits into from
Oct 11, 2020

Conversation

jbrockmendel
Copy link
Member

  • closes #xxxx
  • tests added / passed
  • passes black pandas
  • passes git diff upstream/master -u -- "*.py" | flake8 --diff
  • whatsnew entry

made possible by #36483

jbrockmendel and others added 20 commits October 8, 2020 15:43
* CI: unpin sql to verify the bugs pandas-dev#36465

* CI: pin sqlalchemy

* CI: pin pymsql

* CI: pin sqlalchemy

* CI: pin pymysql

* CI: pin pymysql

* CI: add note
@jreback jreback added the Typing type annotations, mypy/pyright type checking label Oct 10, 2020
Copy link
Contributor

@jreback jreback left a comment

Choose a reason for hiding this comment

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

also checks are failing

@@ -420,6 +421,7 @@ def _constructor(self) -> Type[DataFrame]:
_constructor_sliced: Type[Series] = Series
_deprecations: FrozenSet[str] = NDFrame._deprecations | frozenset([])
_accessors: Set[str] = {"sparse"}
__hash__ = NDFrame.__hash__
Copy link
Contributor

Choose a reason for hiding this comment

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

was this defined before?

Copy link
Member Author

Choose a reason for hiding this comment

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

ATM this PR puts OpsMixin ahead of NDFrame in the MRO, which is why this needs to be re-pinned. flipping those should make this unnecessary

@jreback jreback added this to the 1.2 milestone Oct 11, 2020
@jreback
Copy link
Contributor

jreback commented Oct 11, 2020

wouldn't hurt to merge master

@jbrockmendel
Copy link
Member Author

updated+green

@jreback jreback merged commit 89cc5bf into pandas-dev:master Oct 11, 2020
@jbrockmendel jbrockmendel deleted the ref-frame-methods branch October 11, 2020 21:57
JulianWgs pushed a commit to JulianWgs/pandas that referenced this pull request Oct 26, 2020
* REF/TYP: use OpsMixin for arithmetic methods

* REF: separate arith_method_FRAME from flex_arith_method_FRAME

* whatsnew

* REF/TYP: use OpsMixin for logical methods (pandas-dev#36964)

* TST: insert 'match' to bare pytest raises in pandas/tests/tools/test_to_datetime.py (pandas-dev#37027)

* TST: insert 'match' to bare pytest raises in pandas/tests/test_flags.py (pandas-dev#37026)

Co-authored-by: Rajat Bishnoi <[email protected]>

* TYP: generic, series, frame (pandas-dev#36989)

* CI: pin pymysql pandas-dev#36465 (pandas-dev#36847)

* CI: unpin sql to verify the bugs pandas-dev#36465

* CI: pin sqlalchemy

* CI: pin pymsql

* CI: pin sqlalchemy

* CI: pin pymysql

* CI: pin pymysql

* CI: add note

* CLN/REF: de-duplicate DatetimeTZBlock.setitem (pandas-dev#37019)

* REF/TYP: define NDFrame numeric methods non-dynamically (pandas-dev#37017)

* CLN: require td64 in TimedeltaBlock (pandas-dev#37018)

* BUG: Raise ValueError instead of bare Exception in sanitize_array (pandas-dev#35769)

* CLN: collected cleanups, warning suppression in tests (pandas-dev#37021)

* REF/TYP: use OpsMixin for DataFrame

* CLN: remove get_op_name

* mypy fixup

* de-privatize

Co-authored-by: krajatcl <[email protected]>
Co-authored-by: Rajat Bishnoi <[email protected]>
Co-authored-by: Fangchen Li <[email protected]>
Co-authored-by: Micah Smith <[email protected]>
kesmit13 pushed a commit to kesmit13/pandas that referenced this pull request Nov 2, 2020
* REF/TYP: use OpsMixin for arithmetic methods

* REF: separate arith_method_FRAME from flex_arith_method_FRAME

* whatsnew

* REF/TYP: use OpsMixin for logical methods (pandas-dev#36964)

* TST: insert 'match' to bare pytest raises in pandas/tests/tools/test_to_datetime.py (pandas-dev#37027)

* TST: insert 'match' to bare pytest raises in pandas/tests/test_flags.py (pandas-dev#37026)

Co-authored-by: Rajat Bishnoi <[email protected]>

* TYP: generic, series, frame (pandas-dev#36989)

* CI: pin pymysql pandas-dev#36465 (pandas-dev#36847)

* CI: unpin sql to verify the bugs pandas-dev#36465

* CI: pin sqlalchemy

* CI: pin pymsql

* CI: pin sqlalchemy

* CI: pin pymysql

* CI: pin pymysql

* CI: add note

* CLN/REF: de-duplicate DatetimeTZBlock.setitem (pandas-dev#37019)

* REF/TYP: define NDFrame numeric methods non-dynamically (pandas-dev#37017)

* CLN: require td64 in TimedeltaBlock (pandas-dev#37018)

* BUG: Raise ValueError instead of bare Exception in sanitize_array (pandas-dev#35769)

* CLN: collected cleanups, warning suppression in tests (pandas-dev#37021)

* REF/TYP: use OpsMixin for DataFrame

* CLN: remove get_op_name

* mypy fixup

* de-privatize

Co-authored-by: krajatcl <[email protected]>
Co-authored-by: Rajat Bishnoi <[email protected]>
Co-authored-by: Fangchen Li <[email protected]>
Co-authored-by: Micah Smith <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Typing type annotations, mypy/pyright type checking
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants