py-spacy: new version 2.3.2 (#18294)

* py-spacy: new version 2.3.2

update en-core-web-sm to @2.3.1
add en-vectors-web-lg@2.3.0

* update deps

* wasabi

Co-authored-by: Andrew Elble <aweits@localhost.localdomain>

3 files changed, 28 insertions, 6 deletions

diff --git a/var/spack/repos/builtin/packages/py-spacy-models-en-core-web-sm/package.py b/var/spack/repos/builtin/packages/py-spacy-models-en-core-web-sm/package.py
index 8911958663..24c3af8d74 100644
--- a/var/spack/repos/builtin/packages/py-spacy-models-en-core-web-sm/package.py
+++ b/var/spack/repos/builtin/packages/py-spacy-models-en-core-web-sm/package.py
@@ -9,9 +9,11 @@ class PySpacyModelsEnCoreWebSm(PythonPackage):
     token vectors, POS tags, dependency parse and named entities."""
 
     homepage = "https://spacy.io/models/en#en_core_web_sm"
-    url      = "https://github.com/explosion/spacy-models/releases/download/en_core_web_sm-2.2.5/en_core_web_sm-2.2.5.tar.gz"
+    url      = "https://github.com/explosion/spacy-models/releases/download/en_core_web_sm-2.3.1/en_core_web_sm-2.3.1.tar.gz"
 
+    version('2.3.1', sha256='06c80936324012d1223291d2af41a5229e746dc2dee8fe31a532666ee3d18aaa')
     version('2.2.5', sha256='60b69065c97fd2e4972c33300205e1dead3501d2e0bfd6a182c3a033e337caee')
 
     depends_on('py-setuptools', type='build')
-    depends_on('py-spacy@2.2.2:', type=('build', 'run'))
+    depends_on('py-spacy@2.2.2:', type=('build', 'run'), when='@:2.2.5')
+    depends_on('py-spacy@2.3.0:2.3.999', type=('build', 'run'), when='@2.3.1:')
diff --git a/var/spack/repos/builtin/packages/py-spacy-models-en-vectors-web-lg/package.py b/var/spack/repos/builtin/packages/py-spacy-models-en-vectors-web-lg/package.py
new file mode 100644
index 0000000000..cbaf1027bc
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-spacy-models-en-vectors-web-lg/package.py
@@ -0,0 +1,16 @@
+# Copyright 2013-2020 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+
+class PySpacyModelsEnVectorsWebLg(PythonPackage):
+    """1.2m 300d vectors trained on Common Crawl with GloVe"""
+
+    homepage = "https://spacy.io/models/en-starters#en_vectors_web_lg"
+    url      = "https://github.com/explosion/spacy-models/releases/download/en_vectors_web_lg-2.3.0/en_vectors_web_lg-2.3.0.tar.gz"
+
+    version('2.3.0', sha256='839c177a604cd916e10700b43f7c80ca67fff1f3b5961847ef6c01c8b308e08d')
+
+    depends_on('py-setuptools', type='build')
+    depends_on('py-spacy@2.3.0:2.3.999', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-spacy/package.py b/var/spack/repos/builtin/packages/py-spacy/package.py
index 9e343e4e0d..74e3a35708 100644
--- a/var/spack/repos/builtin/packages/py-spacy/package.py
+++ b/var/spack/repos/builtin/packages/py-spacy/package.py
@@ -9,18 +9,22 @@ class PySpacy(PythonPackage):
     Python and Cython."""
 
     homepage = "https://spacy.io/"
-    url      = "https://pypi.io/packages/source/s/spacy/spacy-2.2.4.tar.gz"
+    url      = "https://pypi.io/packages/source/s/spacy/spacy-2.3.2.tar.gz"
 
+    version('2.3.2', sha256='818de26e0e383f64ccbe3db185574920de05923d8deac8bbb12113b9e33cee1f')
     version('2.2.4', sha256='f0f3a67c5841e6e35d62c98f40ebb3d132587d3aba4f4dccac5056c4e90ff5b9')
 
-    depends_on('python@2.7:2.8,3.4:', type=('build', 'run'))
+    depends_on('python@2.7:2.8,3.4:', type=('build', 'run'), when='@2.2.4:2.2.999')
+    depends_on('python@2.7:2.8,3.5:', type=('build', 'run'), when='@2.3.0:')
     depends_on('py-wheel', type='build')
     depends_on('py-cython@0.25:', type='build')
-    depends_on('py-murmurhash@0.28:1.0', type=('build', 'run'))
     depends_on('py-cymem@2.0.2:2.0.999', type=('build', 'run'))
     depends_on('py-preshed@3.0.2:3.0.999', type=('build', 'run'))
-    depends_on('py-thinc@7.4.0', type=('build', 'run'))
+    depends_on('py-murmurhash@0.28:1.0', type=('build', 'run'))
+    depends_on('py-thinc@7.4.0', type=('build', 'run'), when='@2.2.4:2.2.999')
+    depends_on('py-thinc@7.4.1', type=('build', 'run'), when='@2.3.0:')
     depends_on('py-blis@0.4.0:0.4.999', type=('build', 'run'))
+    depends_on('py-wasabi@0.4.0:1.0.999', type=('build', 'run'))
     depends_on('py-srsly@1.0.2:1.0.999', type=('build', 'run'))
     depends_on('py-catalogue@0.0.7:1.0', type=('build', 'run'))
     depends_on('py-tqdm@4.38:4.999', type=('build', 'run'))