Merge 74439d3e1c into 311f7cc9fb

.github/workflows/tests.yml

@@ -166,7 +166,6 @@ jobs:
         run: |
           python -m pytest --pyargs spacy -W error
         if: "!(startsWith(matrix.os, 'macos') && matrix.python_version == '3.11')"
-
       - name: "Run CPU tests with thinc-apple-ops"
         run: |
           python -m pip install 'spacy[apple]'

pyproject.toml

@@ -5,8 +5,8 @@ requires = [
     "cymem>=2.0.2,<2.1.0",
     "preshed>=3.0.2,<3.1.0",
     "murmurhash>=0.28.0,<1.1.0",
-    "thinc>=8.3.0,<8.4.0",
-    "numpy>=2.0.0,<3.0.0"
+    "thinc>=8.3.3,<8.4.0",
+    "numpy>=1.15.0,<3.0.0"
 ]
 build-backend = "setuptools.build_meta"
 

requirements.txt

@@ -3,7 +3,7 @@ spacy-legacy>=3.0.11,<3.1.0
 spacy-loggers>=1.0.0,<2.0.0
 cymem>=2.0.2,<2.1.0
 preshed>=3.0.2,<3.1.0
-thinc>=8.3.0,<8.4.0
+thinc>=8.3.3,<8.4.0
 ml_datasets>=0.2.0,<0.3.0
 murmurhash>=0.28.0,<1.1.0
 wasabi>=0.9.1,<1.2.0

setup.cfg

@@ -41,7 +41,7 @@ setup_requires =
     cymem>=2.0.2,<2.1.0
     preshed>=3.0.2,<3.1.0
     murmurhash>=0.28.0,<1.1.0
-    thinc>=8.3.0,<8.4.0
+    thinc>=8.3.3,<8.4.0
 install_requires =
     # Our libraries
     spacy-legacy>=3.0.11,<3.1.0
@@ -49,7 +49,7 @@ install_requires =
     murmurhash>=0.28.0,<1.1.0
     cymem>=2.0.2,<2.1.0
     preshed>=3.0.2,<3.1.0
-    thinc>=8.3.0,<8.4.0
+    thinc>=8.3.3,<8.4.0
     wasabi>=0.9.1,<1.2.0
     srsly>=2.4.3,<3.0.0
     catalogue>=2.0.6,<2.1.0
@@ -57,8 +57,8 @@ install_requires =
     # Third-party dependencies
     typer>=0.3.0,<1.0.0
     tqdm>=4.38.0,<5.0.0
-    numpy>=1.15.0; python_version < "3.9"
-    numpy>=1.19.0; python_version >= "3.9"
+    numpy>=1.15.0,<3.0; python_version < "3.9"
+    numpy>=1.19.0,<3.0; python_version >= "3.9"
     requests>=2.13.0,<3.0.0
     pydantic>=1.7.4,!=1.8,!=1.8.1,<3.0.0
     jinja2
@@ -77,43 +77,43 @@ lookups =
 transformers =
     spacy_transformers>=1.1.2,<1.4.0
 cuda =
-    cupy>=5.0.0b4,<13.0.0
+    cupy>=5.0.0b4,<14.0.0
 cuda80 =
-    cupy-cuda80>=5.0.0b4,<13.0.0
+    cupy-cuda80>=5.0.0b4,<14.0.0
 cuda90 =
-    cupy-cuda90>=5.0.0b4,<13.0.0
+    cupy-cuda90>=5.0.0b4,<14.0.0
 cuda91 =
-    cupy-cuda91>=5.0.0b4,<13.0.0
+    cupy-cuda91>=5.0.0b4,<14.0.0
 cuda92 =
-    cupy-cuda92>=5.0.0b4,<13.0.0
+    cupy-cuda92>=5.0.0b4,<14.0.0
 cuda100 =
-    cupy-cuda100>=5.0.0b4,<13.0.0
+    cupy-cuda100>=5.0.0b4,<14.0.0
 cuda101 =
-    cupy-cuda101>=5.0.0b4,<13.0.0
+    cupy-cuda101>=5.0.0b4,<14.0.0
 cuda102 =
-    cupy-cuda102>=5.0.0b4,<13.0.0
+    cupy-cuda102>=5.0.0b4,<14.0.0
 cuda110 =
-    cupy-cuda110>=5.0.0b4,<13.0.0
+    cupy-cuda110>=5.0.0b4,<14.0.0
 cuda111 =
-    cupy-cuda111>=5.0.0b4,<13.0.0
+    cupy-cuda111>=5.0.0b4,<14.0.0
 cuda112 =
-    cupy-cuda112>=5.0.0b4,<13.0.0
+    cupy-cuda112>=5.0.0b4,<14.0.0
 cuda113 =
-    cupy-cuda113>=5.0.0b4,<13.0.0
+    cupy-cuda113>=5.0.0b4,<14.0.0
 cuda114 =
-    cupy-cuda114>=5.0.0b4,<13.0.0
+    cupy-cuda114>=5.0.0b4,<14.0.0
 cuda115 =
-    cupy-cuda115>=5.0.0b4,<13.0.0
+    cupy-cuda115>=5.0.0b4,<14.0.0
 cuda116 =
-    cupy-cuda116>=5.0.0b4,<13.0.0
+    cupy-cuda116>=5.0.0b4,<14.0.0
 cuda117 =
-    cupy-cuda117>=5.0.0b4,<13.0.0
+    cupy-cuda117>=5.0.0b4,<14.0.0
 cuda11x =
-    cupy-cuda11x>=11.0.0,<13.0.0
+    cupy-cuda11x>=11.0.0,<14.0.0
 cuda12x =
-    cupy-cuda12x>=11.5.0,<13.0.0
+    cupy-cuda12x>=11.5.0,<14.0.0
 cuda-autodetect =
-    cupy-wheel>=11.0.0,<13.0.0
+    cupy-wheel>=11.0.0,<14.0.0
 apple =
     thinc-apple-ops>=1.0.0,<2.0.0
 # Language tokenizers with external dependencies

spacy/tests/training/test_pretraining.py

@@ -265,7 +265,7 @@ def test_pretraining_tagger():
 
 
 # Try to debug segfault on windows
-#def test_pretraining_training():
+# def test_pretraining_training():
 #    """Test that training can use a pretrained Tok2Vec model"""
 #    config = Config().from_str(pretrain_string_internal)
 #    nlp = util.load_model_from_config(config, auto_fill=True, validate=False)