Skip to content

Commit

Permalink
Merge pull request #2368 from hypothesis/upgrade-annotator-store
Browse files Browse the repository at this point in the history
Upgrade to annotator-store v0.14.2
  • Loading branch information
tilgovi committed Jul 17, 2015
2 parents 9fc9c88 + 1841ba9 commit ecc3ffd
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
3 changes: 1 addition & 2 deletions h/streamer.py
Original file line number Diff line number Diff line change
Expand Up @@ -495,8 +495,7 @@ def _expand_uris(self, clause):
available_uris = set(uris)
for uri in uris:
doc = document.Document.get_by_uri(uri)
# get_by_uri() returns an empty list when no document is found
if isinstance(doc, list):
if doc is None:
return
for eq_uri in doc.uris():
available_uris.add(eq_uri)
Expand Down
2 changes: 1 addition & 1 deletion h/test/streamer_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ def test_filter_message_will_not_change_for_empty_doc(self):
})

with patch('annotator.document.Document.get_by_uri') as doc:
doc.return_value = []
doc.return_value = None
msg = MagicMock()
msg.data = filter_message

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def run_tests(self):
'PyJWT>=1.0.0,<2.0.0',
'SQLAlchemy>=0.8.0',
'alembic>=0.7.0',
'annotator>=0.14.1,<0.15',
'annotator>=0.14.2,<0.15',
'blinker>=1.3,<1.4',
'cryptacular>=1.4,<1.5',
'cryptography>=0.7',
Expand Down

0 comments on commit ecc3ffd

Please sign in to comment.