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

BUG: fix empty sjoin #762

Merged
merged 3 commits into from Jul 14, 2018

Conversation

Projects
None yet
2 participants
@ljwolf
Copy link
Member

commented Jul 7, 2018

Closes #731

This makes sure that the key dtype in empty spatial joins is float, addressing but #731.

@jorisvandenbossche
Copy link
Member

left a comment

Thanks! small comment

@@ -117,6 +117,18 @@ def test_left(self, op, dfs):

assert_frame_equal(res, exp)

# Check empty joins on left

This comment has been minimized.

Copy link
@jorisvandenbossche

jorisvandenbossche Jul 7, 2018

Member

Can you maybe make this just a separate test? (test_empty_join or something)

This comment has been minimized.

Copy link
@ljwolf

ljwolf Jul 7, 2018

Author Member

sure, yes

@ljwolf ljwolf force-pushed the ljwolf:empty-sjoin branch from b13ab98 to 32d9254 Jul 7, 2018

@codecov

This comment has been minimized.

Copy link

commented Jul 7, 2018

Codecov Report

Merging #762 into master will increase coverage by 0.08%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #762      +/-   ##
==========================================
+ Coverage   94.93%   95.02%   +0.08%     
==========================================
  Files          15       15              
  Lines        1145     1145              
==========================================
+ Hits         1087     1088       +1     
+ Misses         58       57       -1
Impacted Files Coverage Δ
geopandas/tools/sjoin.py 96.66% <100%> (+1.66%) ⬆️

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 09a579a...066e5eb. Read the comment docs.

@@ -117,6 +117,23 @@ def test_left(self, op, dfs):

assert_frame_equal(res, exp)

def test_empty_join(self):
# Check empty joins on left

This comment has been minimized.

Copy link
@jorisvandenbossche

jorisvandenbossche Jul 7, 2018

Member

minor nit, but the indentation seems a bit too much here?

This comment has been minimized.

Copy link
@ljwolf

ljwolf Jul 7, 2018

Author Member

yep, no, was not intended. thanks for catching this.

@ljwolf ljwolf force-pushed the ljwolf:empty-sjoin branch from 771aacc to 066e5eb Jul 7, 2018

@jorisvandenbossche jorisvandenbossche changed the title add patch for sjoin in #731 and test BUG: fix empty sjoin Jul 14, 2018

@jorisvandenbossche jorisvandenbossche merged commit 88ea628 into geopandas:master Jul 14, 2018

4 checks passed

codecov/patch 100% of diff hit (target 94.93%)
Details
codecov/project 95.02% (+0.08%) compared to 09a579a
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.