Fix conflict

examples/training/conllu.py

@@ -22,7 +22,6 @@ from spacy.matcher import Matcher
 import itertools
 import random
 import numpy.random
-import cytoolz
 
 import conll17_ud_eval
 

requirements.txt

@@ -11,7 +11,7 @@ regex==2018.01.10
 requests>=2.13.0,<3.0.0
 jsonschema>=2.6.0,<3.0.0
 wasabi>=0.0.8,<1.1.0
-srsly>=0.0.4,<1.1.0
+srsly>=0.0.5,<1.1.0
 pathlib==1.0.1; python_version < "3.4"
 # Development dependencies
 cython>=0.25

setup.py

@@ -208,7 +208,7 @@ def setup_package():
                 "requests>=2.13.0,<3.0.0",
                 "jsonschema>=2.6.0,<3.0.0",
                 "wasabi>=0.0.8,<1.1.0",
-                "srsly>=0.0.4,<1.1.0",
+                "srsly>=0.0.5,<1.1.0",
                 'pathlib==1.0.1; python_version < "3.4"',
             ],
             setup_requires=["wheel"],

spacy/cli/converters/iob2json.py

@@ -1,7 +1,7 @@
 # coding: utf8
 from __future__ import unicode_literals
 
-from cytoolz import partition_all
+import cytoolz
 
 from ...gold import iob_to_biluo
 
@@ -11,7 +11,7 @@ def iob2json(input_data, n_sents=10, *args, **kwargs):
     Convert IOB files into JSON format for use with train cli.
     """
     docs = []
-    for group in partition_all(n_sents, docs):
+    for group in cytoolz.partition_all(n_sents, docs):
         group = list(group)
         first = group.pop(0)
         to_extend = first["paragraphs"][0]["sentences"]

spacy/cli/ud/ud_run_test.py

@@ -30,7 +30,6 @@ Fused_inside = None
 import itertools
 import random
 import numpy.random
-import cytoolz
 
 from . import conll17_ud_eval
 

spacy/cli/ud/ud_train.py

@@ -25,7 +25,6 @@ from timeit import default_timer as timer
 import itertools
 import random
 import numpy.random
-import cytoolz
 
 from . import conll17_ud_eval
 

spacy/gold.pyx

@@ -4,7 +4,6 @@ from __future__ import unicode_literals, print_function
 
 import re
 import random
-import itertools
 import numpy
 import tempfile
 import shutil

spacy/syntax/_parser_model.pyx

@@ -7,7 +7,6 @@ from __future__ import unicode_literals, print_function
 from collections import OrderedDict
 import numpy
 cimport cython.parallel
-import cytoolz
 import numpy.random
 cimport numpy as np
 from libc.math cimport exp