Merge branch 'develop' of https://github.com/explosion/spaCy into develop

spacy/tests/parser/test_neural_parser.py

@@ -54,12 +54,14 @@ def test_build_model(parser):
     assert parser.model is not None
 
 
+@pytest.mark.xfail
 def test_predict_doc(parser, tok2vec, model, doc):
     doc.tensor = tok2vec([doc])
     parser.model = model
     parser(doc)
 
 
+@pytest.mark.xfail
 def test_update_doc(parser, tok2vec, model, doc, gold):
     parser.model = model
     tokvecs, bp_tokvecs = tok2vec.begin_update([doc])

spacy/tests/regression/test_issue617.py

@@ -1,12 +0,0 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
-from ...vocab import Vocab
-
-
-def test_issue617():
-    """Test loading Vocab with string"""
-    try:
-        vocab = Vocab.load('/tmp/vocab')
-    except IOError:
-        pass