diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3da2b63d8f..ac828c991f 100644 --- a/.github/workflows/tests.yml +++ b/.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]' diff --git a/build-constraints.txt b/build-constraints.txt index b1cf596ca7..94ebdc0705 100644 --- a/build-constraints.txt +++ b/build-constraints.txt @@ -1,6 +1,2 @@ # build version constraints for use with wheelwright -numpy==1.15.0; python_version=='3.7' and platform_machine!='aarch64' -numpy==1.19.2; python_version=='3.7' and platform_machine=='aarch64' -numpy==1.17.3; python_version=='3.8' and platform_machine!='aarch64' -numpy==1.19.2; python_version=='3.8' and platform_machine=='aarch64' -numpy>=1.25.0; python_version>='3.9' +numpy>=2.0.0,<3.0.0 diff --git a/pyproject.toml b/pyproject.toml index 2edbadefc8..a738ce7cb6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,9 +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,<2.1.0; python_version < '3.9'", - "numpy>=2.0.0,<2.1.0; python_version >= '3.9'", + "thinc>=8.3.3,<8.4.0", + "numpy>=1.15.0,<3.0.0" ] build-backend = "setuptools.build_meta" diff --git a/requirements.txt b/requirements.txt index c1e4a4508f..fc03e70184 100644 --- a/requirements.txt +++ b/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 @@ -12,8 +12,7 @@ catalogue>=2.0.6,<2.1.0 typer>=0.3.0,<1.0.0 weasel>=0.1.0,<0.5.0 # Third party dependencies -numpy>=2.0.0; python_version < "3.9" -numpy>=2.0.0; python_version >= "3.9" +numpy>=2.0.0,<3.0.0 requests>=2.13.0,<3.0.0 tqdm>=4.38.0,<5.0.0 pydantic>=1.7.4,!=1.8,!=1.8.1,<3.0.0 diff --git a/setup.cfg b/setup.cfg index dc2493ed76..c2a7bc0490 100644 --- a/setup.cfg +++ b/setup.cfg @@ -30,7 +30,7 @@ project_urls = [options] zip_safe = false include_package_data = true -python_requires = >=3.9,<3.13 +python_requires = >=3.9,<3.14 # NOTE: This section is superseded by pyproject.toml and will be removed in # spaCy v4 setup_requires = @@ -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 diff --git a/spacy/about.py b/spacy/about.py index a42f63a5d6..f85bf6d5fe 100644 --- a/spacy/about.py +++ b/spacy/about.py @@ -1,5 +1,5 @@ # fmt: off __title__ = "spacy" -__version__ = "3.8.3" +__version__ = "3.8.4" __download_url__ = "https://github.com/explosion/spacy-models/releases/download" __compatibility__ = "https://raw.githubusercontent.com/explosion/spacy-models/master/compatibility.json" diff --git a/spacy/tests/training/test_pretraining.py.disabled b/spacy/tests/training/test_pretraining.py similarity index 99% rename from spacy/tests/training/test_pretraining.py.disabled rename to spacy/tests/training/test_pretraining.py index 22364bb78d..41cbddcae9 100644 --- a/spacy/tests/training/test_pretraining.py.disabled +++ b/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)