Merge branch 'develop'

spacy/language_data/punctuation.py

@@ -107,7 +107,7 @@ TOKENIZER_INFIXES = (
         r'(?<=[{al}])\.(?=[{au}])'.format(al=ALPHA_LOWER, au=ALPHA_UPPER),
         r'(?<=[{a}]),(?=[{a}])'.format(a=ALPHA),
         r'(?<=[{a}])[?";:=,.]*(?:{h})(?=[{a}])'.format(a=ALPHA, h=HYPHENS),
-        r'(?<=[{a}"])[:<>=](?=[{a}])'.format(a=ALPHA)
+        r'(?<=[{a}"])[:<>=/](?=[{a}])'.format(a=ALPHA)
     ]
 )
 

spacy/tests/regression/test_issue758.py

@@ -5,8 +5,6 @@ from ...matcher import merge_phrase
 import pytest
 
 
-
-
 @pytest.mark.models
 def test_issue758():
     '''Test parser transition bug after label added.'''

spacy/tests/regression/test_issue891.py

@@ -4,7 +4,6 @@ from __future__ import unicode_literals
 import pytest
 
 
-@pytest.mark.xfail
 @pytest.mark.parametrize('text', ["want/need"])
 def test_issue891(en_tokenizer, text):
     """Test that / infixes are split correctly."""