Skip to content

ENH: improve 'incompatible tolerance' error message in merge_asof #17260

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
Nov 10, 2017
Merged

ENH: improve 'incompatible tolerance' error message in merge_asof #17260

merged 2 commits into from
Nov 10, 2017

Conversation

leifwalsh
Copy link
Contributor

No description provided.

@jreback jreback added the Error Reporting Incorrect or improved errors from pandas label Aug 15, 2017
@jreback jreback added this to the 0.21.0 milestone Aug 15, 2017
gfyoung
gfyoung reviewed Aug 15, 2017
View reviewed changes
pandas/core/reshape/merge.py Outdated
msg = "incompatible tolerance, must be compat " \
"with type {0}".format(type(lt))
msg = "incompatible tolerance {0}, must be compat " \
"with type {1}".format(type(tolerance), lt.dtype)
Copy link
Member

Choose a reason for hiding this comment

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

  1. Let's use keyword arguments instead of {0} and {1}.

  2. Is there a test to check this error message? If not, let's add one.

Copy link
Member

Choose a reason for hiding this comment

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

And I suppose it has to be self.tolerance instead of tolerance (see failing tests)

@jreback
Copy link
Contributor

jreback commented Sep 23, 2017

@leifwalsh can you rebase and use kw args, change to use self.tolerance, no test is necessary here

@jreback jreback removed this from the 0.21.0 milestone Sep 28, 2017
@jreback
Copy link
Contributor

jreback commented Sep 28, 2017

ping

@jreback jreback added this to the 0.21.1 milestone Nov 10, 2017
@jreback jreback force-pushed the merge_asof_error_message branch from e33689b to a9ac6f9 Compare November 10, 2017 20:30
@codecov
Copy link

codecov bot commented Nov 10, 2017 •
edited
Loading

Codecov Report

Merging #17260 into master will decrease coverage by 0.01%.
The diff coverage is 75%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #17260      +/-   ##
==========================================
- Coverage   91.42%   91.41%   -0.02%     
==========================================
  Files         163      163              
  Lines       50068    50068              
==========================================
- Hits        45777    45768       -9     
- Misses       4291     4300       +9
Flag Coverage Δ
#multiple 89.22% <75%> (ø) ⬆️
#single 40.35% <0%> (-0.06%) ⬇️
Impacted Files Coverage Δ
pandas/core/reshape/merge.py 94.26% <75%> (ø) ⬆️
pandas/io/gbq.py 25% <0%> (-58.34%) ⬇️
pandas/core/frame.py 97.8% <0%> (-0.1%) ⬇️

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 d8129b4...a9ac6f9. Read the comment docs.

@codecov
Copy link

codecov bot commented Nov 10, 2017 •
edited
Loading

Codecov Report

Merging #17260 into master will decrease coverage by 0.01%.
The diff coverage is 75%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #17260      +/-   ##
==========================================
- Coverage   91.42%   91.41%   -0.02%     
==========================================
  Files         163      163              
  Lines       50068    50068              
==========================================
- Hits        45777    45768       -9     
- Misses       4291     4300       +9
Flag Coverage Δ
#multiple 89.22% <75%> (ø) ⬆️
#single 40.35% <0%> (-0.06%) ⬇️
Impacted Files Coverage Δ
pandas/core/reshape/merge.py 94.26% <75%> (ø) ⬆️
pandas/io/gbq.py 25% <0%> (-58.34%) ⬇️
pandas/core/frame.py 97.8% <0%> (-0.1%) ⬇️

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 d8129b4...a9ac6f9. Read the comment docs.

@jreback jreback merged commit f68bf25 into pandas-dev:master Nov 10, 2017
No-Stream pushed a commit to No-Stream/pandas that referenced this pull request Nov 28, 2017
@leifwalsh @No-Stream
ENH: improve 'incompatible tolerance' error message in merge_asof (pa…
e08426e 
…ndas-dev#17260)
TomAugspurger pushed a commit to TomAugspurger/pandas that referenced this pull request Dec 8, 2017
@leifwalsh @TomAugspurger
ENH: improve 'incompatible tolerance' error message in merge_asof (pa…
4df0d2a 
…ndas-dev#17260)

(cherry picked from commit f68bf25)
TomAugspurger pushed a commit that referenced this pull request Dec 11, 2017
@leifwalsh @TomAugspurger
ENH: improve 'incompatible tolerance' error message in merge_asof (#1…
71e7a61 
…7260)

(cherry picked from commit f68bf25)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jorisvandenbossche jorisvandenbossche jorisvandenbossche left review comments

@gfyoung gfyoung gfyoung left review comments

Assignees
No one assigned
Labels
Error Reporting Incorrect or improved errors from pandas
Projects
None yet
Milestone
0.21.1
Development

Successfully merging this pull request may close these issues.
4 participants
@leifwalsh @jreback @jorisvandenbossche @gfyoung