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

Fix error from two conflicting merges #2219

Merged
merged 3 commits into from Apr 12, 2022

Conversation

ChuckHastings
Copy link
Collaborator

I added a new algorithm while Seunghwa modified a graph_view method name. The two PRs passed and merged but introduced this error.

@ChuckHastings ChuckHastings requested a review from a team as a code owner April 12, 2022 00:22
@ChuckHastings ChuckHastings self-assigned this Apr 12, 2022
@ChuckHastings ChuckHastings added bug Something isn't working 3 - Ready for Review non-breaking Non-breaking change labels Apr 12, 2022
@ChuckHastings ChuckHastings added this to the 22.06 milestone Apr 12, 2022
@codecov-commenter
Copy link

codecov-commenter commented Apr 12, 2022

Codecov Report

Merging #2219 (b2bc5d9) into branch-22.06 (38be932) will increase coverage by 0.04%.
The diff coverage is 100.00%.

❗ Current head b2bc5d9 differs from pull request most recent head 6477008. Consider uploading reports for the commit 6477008 to get more accurate results

@@               Coverage Diff                @@
##           branch-22.06    #2219      +/-   ##
================================================
+ Coverage         70.82%   70.86%   +0.04%     
================================================
  Files               170      170              
  Lines             11036    11036              
================================================
+ Hits               7816     7821       +5     
+ Misses             3220     3215       -5     
Impacted Files Coverage Δ
python/cugraph/cugraph/structure/hypergraph.py 90.00% <100.00%> (ø)
.../cugraph/tests/test_edge_betweenness_centrality.py 84.93% <0.00%> (+0.60%) ⬆️
...graph/cugraph/tests/test_betweenness_centrality.py 83.01% <0.00%> (+0.62%) ⬆️
python/cugraph/cugraph/tests/test_graph_store.py 100.00% <0.00%> (+1.56%) ⬆️
python/cugraph/cugraph/tests/test_utils.py 75.55% <0.00%> (+4.44%) ⬆️

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 cd9d7ed...6477008. Read the comment docs.

@ChuckHastings
Copy link
Collaborator Author

@gpucibot merge

@rapids-bot rapids-bot bot merged commit b8a6c60 into rapidsai:branch-22.06 Apr 12, 2022
22.06 Release automation moved this from PRs to Done Apr 12, 2022
betochimas added a commit to betochimas/cugraph that referenced this pull request Apr 12, 2022
Fix error from two conflicting merges (rapidsai#2219)
@ChuckHastings ChuckHastings deleted the fix_katz branch August 4, 2022 18:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working non-breaking Non-breaking change
Projects
No open projects
22.06 Release
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

3 participants