Merge branch 'master' of https://github.com/honnibal/spaCy

requirements.txt

@@ -2,7 +2,7 @@ cython
 cymem == 1.11
 pathlib
 preshed == 0.37
-thinc == 3.0
+thinc == 3.2
 murmurhash == 0.24
 unidecode
 numpy

setup.py

@@ -118,7 +118,7 @@ def run_setup(exts):
         ext_modules=exts,
         license="Dual: Commercial or AGPL",
         install_requires=['numpy', 'murmurhash', 'cymem >= 1.11', 'preshed == 0.37',
-                          'thinc == 3.0', "unidecode", 'wget', 'plac', 'six',
+                          'thinc == 3.2', "unidecode", 'wget', 'plac', 'six',
                           'ujson'],
         setup_requires=["headers_workaround"],
     )
@@ -130,7 +130,7 @@ def run_setup(exts):
     headers_workaround.install_headers('numpy')
 
 
-VERSION = '0.86'
+VERSION = '0.87'
 def main(modules, is_pypy):
     language = "cpp"
     includes = ['.', path.join(sys.prefix, 'include')]

spacy/en/attrs.pxd

@@ -1,5 +1,7 @@
 from ..attrs cimport FLAG0, FLAG1, FLAG2, FLAG3, FLAG4, FLAG5, FLAG6, FLAG7
-from ..attrs cimport FLAG8, FLAG9, FLAG10
+from ..attrs cimport FLAG8, FLAG9, FLAG10, FLAG11, FLAG12, FLAG13, FLAG14
+from ..attrs cimport FLAG15, FLAG16, FLAG17, FLAG18, FLAG19, FLAG20, FLAG21
+from ..attrs cimport FLAG22, FLAG23, FLAG24, FLAG25, FLAG26, FLAG27, FLAG28
 from ..attrs cimport ORTH as _ORTH
 from ..attrs cimport SHAPE as _SHAPE
 from ..attrs cimport LOWER as _LOWER
@@ -26,6 +28,31 @@ cpdef enum:
     LIKE_NUM = FLAG9
     IS_STOP = FLAG10
  
+    EMO_POS = FLAG11
+    EMO_NEG = FLAG12
+
+    EMO_ANGER = FLAG13
+    EMO_APATE = FLAG14
+    EMO_DISGUST = FLAG15
+    EMO_FEAR = FLAG16
+    EMO_JOY = FLAG17
+    EMO_SAD = FLAG18
+    EMO_SURPRISE = FLAG19
+    EMO_TRUST = FLAG20
+
+    CLR_NONE = FLAG21
+    CLR_BLACK = FLAG22
+    CLR_BLUE = FLAG23
+    CLR_BROWN = FLAG24
+    CLR_GREEN = FLAG25
+    CLR_GREY = FLAG26
+    CLR_ORANGE = FLAG27
+    CLR_PURPLE = FLAG28
+    CLR_PINK = FLAG29
+    CLR_RED = FLAG30
+    CLR_WHITE = FLAG31
+    CLR_YELLOW = FLAG32
+
     ORTH = _ORTH
     SHAPE = _SHAPE
     LOWER = _LOWER

spacy/en/download.py

@@ -7,17 +7,12 @@ import wget
 import plac
 
 # TODO: Read this from the same source as the setup
-VERSION = '0.8.6'
+VERSION = '0.8.7'
 
 AWS_STORE = 'http://s3-us-west-1.amazonaws.com/media.spacynlp.com'
 
 ALL_DATA_DIR_URL = '%s/en_data_all-%s.tgz' % (AWS_STORE, VERSION)
 
-SM_DATA_DIR_URL = '%s/en_data_sm-%s.tgz' % (AWS_STORE, VERSION)
-
-SPEECH_DATA_DIR_URL = '%s/en_data_speech-%s.tgz' % (AWS_STORE, VERSION)
-
-
 DEST_DIR = path.join(path.dirname(__file__), 'data')
 
 def download_file(url, out):