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

TYP: generic, series, frame #36989

Merged
merged 4 commits into from
Oct 10, 2020
Merged

Conversation

jbrockmendel
Copy link
Member

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

cc @simonjayhawkins

@jreback jreback added the Typing type annotations, mypy/pyright type checking label Oct 8, 2020
@jreback jreback added this to the 1.2 milestone Oct 8, 2020
pandas/core/frame.py Show resolved Hide resolved
@@ -1789,12 +1789,17 @@ def count(self, level=None):
"""
if level is None:
return notna(self.array).sum()
elif not isinstance(self.index, MultiIndex):
raise ValueError("Series.count level is only valid with a MultiIndex")
Copy link
Contributor

Choose a reason for hiding this comment

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

is this hit in a test?

Copy link
Member Author

Choose a reason for hiding this comment

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

no. ill add one in my just started collected-followups branch

@jreback jreback merged commit 9b6cbfd into pandas-dev:master Oct 10, 2020
@jbrockmendel jbrockmendel deleted the typ-generic branch October 10, 2020 16:24
jbrockmendel added a commit to jbrockmendel/pandas that referenced this pull request Oct 10, 2020
jreback pushed a commit that referenced this pull request Oct 11, 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 (#36964)

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

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

Co-authored-by: Rajat Bishnoi <rajat.b@greyorange.com>

* TYP: generic, series, frame (#36989)

* CI: pin pymysql #36465 (#36847)

* CI: unpin sql to verify the bugs #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 (#37019)

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

* CLN: require td64 in TimedeltaBlock (#37018)

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

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

* REF/TYP: use OpsMixin for DataFrame

* CLN: remove get_op_name

* mypy fixup

* de-privatize

Co-authored-by: krajatcl <53620269+krajatcl@users.noreply.github.com>
Co-authored-by: Rajat Bishnoi <rajat.b@greyorange.com>
Co-authored-by: Fangchen Li <fangchen.li@outlook.com>
Co-authored-by: Micah Smith <micahjsmith@gmail.com>
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 <rajat.b@greyorange.com>

* 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 <53620269+krajatcl@users.noreply.github.com>
Co-authored-by: Rajat Bishnoi <rajat.b@greyorange.com>
Co-authored-by: Fangchen Li <fangchen.li@outlook.com>
Co-authored-by: Micah Smith <micahjsmith@gmail.com>
kesmit13 pushed a commit to kesmit13/pandas that referenced this pull request Nov 2, 2020
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 <rajat.b@greyorange.com>

* 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 <53620269+krajatcl@users.noreply.github.com>
Co-authored-by: Rajat Bishnoi <rajat.b@greyorange.com>
Co-authored-by: Fangchen Li <fangchen.li@outlook.com>
Co-authored-by: Micah Smith <micahjsmith@gmail.com>
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.

2 participants