Problem: The Block class is deprecated#2368
Merged
z-bowen merged 3 commits intobigchaindb:masterfrom Jun 29, 2018
Merged
Conversation
Solution: add wget to the requirements for docs
Solution: remove the block class and all occurrences
ldmberman
reviewed
Jun 29, 2018
| import pytest | ||
|
|
||
| from bigchaindb.common.transaction import TransactionLink | ||
| from bigchaindb.models import Block, Transaction |
Contributor
There was a problem hiding this comment.
I deleted the file in the fastquery cleanup. Can you exclude it from here so that we avoid some git conflicts?
Contributor
Author
There was a problem hiding this comment.
I can merge your PR. That's the only solution. I needed to remove it because otherwise my tests and linter were failing.
Contributor
There was a problem hiding this comment.
Ah, did not get that, sorry. We can resolve the conflict then.
Contributor
Author
There was a problem hiding this comment.
I think it depends when we merge the PRs
If your PR is merged before mine, I can just merge master into mine. If mine is merged before it should actually not be a conflict (I think)
ldmberman
approved these changes
Jun 29, 2018
Codecov Report
@@ Coverage Diff @@
## master #2368 +/- ##
==========================================
+ Coverage 83.07% 86.64% +3.56%
==========================================
Files 38 38
Lines 2245 2126 -119
==========================================
- Hits 1865 1842 -23
+ Misses 380 284 -96 |
z-bowen
approved these changes
Jun 29, 2018
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Solution: remove the block class and all occurrences