Skip to content

Commit

Permalink
support pandas==1.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
casperdcl committed Jul 3, 2021
1 parent 4735e81 commit f4cc427
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .meta/.readme.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1251,7 +1251,7 @@ Citation information: |DOI|
.. |GitHub-Updated| image:: https://img.shields.io/github/last-commit/tqdm/tqdm/master.svg?logo=github&logoColor=white&label=pushed
:target: https://github.com/tqdm/tqdm/pulse
.. |Gift-Casper| image:: https://img.shields.io/badge/dynamic/json.svg?color=ff69b4&label=gifts%20received&prefix=%C2%A3&query=%24..sum&url=https%3A%2F%2Fcaspersci.uk.to%2Fgifts.json
:target: https://www.cdcl.ml/sponsor
:target: https://cdcl.ml/sponsor
.. |Versions| image:: https://img.shields.io/pypi/v/tqdm.svg
:target: https://tqdm.github.io/releases
.. |PyPI-Downloads| image:: https://img.shields.io/pypi/dm/tqdm.svg?label=pypi%20downloads&logo=PyPI&logoColor=white
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1470,7 +1470,7 @@ Citation information: |DOI|
.. |GitHub-Updated| image:: https://img.shields.io/github/last-commit/tqdm/tqdm/master.svg?logo=github&logoColor=white&label=pushed
:target: https://github.com/tqdm/tqdm/pulse
.. |Gift-Casper| image:: https://img.shields.io/badge/dynamic/json.svg?color=ff69b4&label=gifts%20received&prefix=%C2%A3&query=%24..sum&url=https%3A%2F%2Fcaspersci.uk.to%2Fgifts.json
:target: https://www.cdcl.ml/sponsor
:target: https://cdcl.ml/sponsor
.. |Versions| image:: https://img.shields.io/pypi/v/tqdm.svg
:target: https://tqdm.github.io/releases
.. |PyPI-Downloads| image:: https://img.shields.io/pypi/dm/tqdm.svg?label=pypi%20downloads&logo=PyPI&logoColor=white
Expand Down
6 changes: 5 additions & 1 deletion tqdm/std.py
Original file line number Diff line number Diff line change
Expand Up @@ -791,8 +791,12 @@ def inner(df, func, *args, **kwargs):
" Use keyword arguments instead.",
fp_write=getattr(t.fp, 'write', sys.stderr.write))

try: # pandas>=1.3.0
from pandas.core.common import is_builtin_func
except ImportError:
is_builtin_func = df._is_builtin_func
try:
func = df._is_builtin_func(func)
func = is_builtin_func(func)
except TypeError:
pass

Expand Down

0 comments on commit f4cc427

Please sign in to comment.