Skip to content

Compat with numpy dev argsort (radix sort added) #26373

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

Jump to bottom
Merged
merged 2 commits into from
May 13, 2019
Merged

Compat with numpy dev argsort (radix sort added) #26373

merged 2 commits into from
May 13, 2019

Conversation

TomAugspurger
Copy link
Contributor

numpy/numpy@12fb101
adds radix sort to np.argsort. For versions of NumPy with this change
(>=1.17), we need to adjust our validator.

Closes #26361

@TomAugspurger
Compat with numpy dev
20437ef 
numpy/numpy@12fb101
adds radix sort to np.argsort. For versions of NumPy with this change
(>=1.17), we need to adjust our validator.

Closes pandas-dev#26361
@TomAugspurger TomAugspurger added this to the 0.25.0 milestone May 13, 2019
@TomAugspurger TomAugspurger changed the title Compat with numpy dev Compat with numpy dev argsort (radix sort added) May 13, 2019
@TomAugspurger TomAugspurger added CI Continuous Integration Compat pandas objects compatability with Numpy or Python functions labels May 13, 2019
TomAugspurger
TomAugspurger commented May 13, 2019
View reviewed changes
pandas/compat/numpy/function.py
@@ -107,6 +108,12 @@ def validate_argmax_with_skipna(skipna, args, kwargs):
ARGSORT_DEFAULTS['axis'] = -1
ARGSORT_DEFAULTS['kind'] = 'quicksort'
ARGSORT_DEFAULTS['order'] = None

if LooseVersion(_np_version) >= LooseVersion("1.17.0"):
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is defined in pandas/compat/numpy/__init__.py, but I don't want to create a circular import.

Copy link
Contributor

Choose a reason for hiding this comment

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

ok here

@codecov
Copy link

codecov bot commented May 13, 2019

Codecov Report

Merging #26373 into master will decrease coverage by 50.48%.
The diff coverage is 75%.

Impacted file tree graph

@@             Coverage Diff             @@
##           master   #26373       +/-   ##
===========================================
- Coverage   91.68%   41.19%   -50.49%     
===========================================
  Files         174      174               
  Lines       50700    50703        +3     
===========================================
- Hits        46486    20889    -25597     
- Misses       4214    29814    +25600
Flag Coverage Δ
#multiple ?
#single 41.19% <75%> (-0.15%) ⬇️
Impacted Files Coverage Δ
pandas/compat/numpy/function.py 60.45% <75%> (-30.36%) ⬇️
pandas/io/formats/latex.py 0% <0%> (-100%) ⬇️
pandas/io/sas/sas_constants.py 0% <0%> (-100%) ⬇️
pandas/core/groupby/categorical.py 0% <0%> (-100%) ⬇️
pandas/tseries/plotting.py 0% <0%> (-100%) ⬇️
pandas/tseries/converter.py 0% <0%> (-100%) ⬇️
pandas/io/formats/html.py 0% <0%> (-99.37%) ⬇️
pandas/io/sas/sas7bdat.py 0% <0%> (-91.16%) ⬇️
pandas/io/sas/sas_xport.py 0% <0%> (-90.1%) ⬇️
pandas/core/tools/numeric.py 10.44% <0%> (-89.56%) ⬇️
... and 130 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b48d1ff...eb3fba5. Read the comment docs.

@codecov
Copy link

codecov bot commented May 13, 2019 •
edited
Loading

Codecov Report

Merging #26373 into master will decrease coverage by <.01%.
The diff coverage is 75%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #26373      +/-   ##
==========================================
- Coverage   91.68%   91.67%   -0.01%     
==========================================
  Files         174      174              
  Lines       50700    50703       +3     
==========================================
- Hits        46486    46484       -2     
- Misses       4214     4219       +5
Flag Coverage Δ
#multiple 90.18% <75%> (-0.01%) ⬇️
#single 41.17% <75%> (-0.18%) ⬇️
Impacted Files Coverage Δ
pandas/compat/numpy/function.py 90.39% <75%> (-0.41%) ⬇️
pandas/io/gbq.py 78.94% <0%> (-10.53%) ⬇️
pandas/core/frame.py 97.01% <0%> (-0.12%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b48d1ff...eb3fba5. Read the comment docs.

@TomAugspurger
Copy link
Contributor Author

Seems like an isort update is failing on master as well. I've pushed that here, so we can get master green in a single PR.

A quick review would be appreciated if anyone has time, since this is failing on master.

@jreback
Copy link
Contributor

jreback commented May 13, 2019

lgtm. merge on green.

@TomAugspurger TomAugspurger merged commit a6e43a4 into pandas-dev:master May 13, 2019
@TomAugspurger TomAugspurger deleted the 26361-numpydev branch May 13, 2019 17:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jreback jreback jreback left review comments

Assignees
No one assigned
Labels
CI Continuous Integration Compat pandas objects compatability with Numpy or Python functions
Projects
None yet
Milestone
0.25.0
Development

Successfully merging this pull request may close these issues.

COMPAT: numpy_dev build failing
2 participants
@TomAugspurger @jreback