diff --git a/.github/azure-steps.yml b/.github/azure-steps.yml index 8501b2abe..80c88b0b8 100644 --- a/.github/azure-steps.yml +++ b/.github/azure-steps.yml @@ -27,6 +27,7 @@ steps: - script: python -m mypy spacy displayName: 'Run mypy' + condition: ne(variables['python_version'], '3.10') - task: DeleteFiles@1 inputs: diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6bf591bee..4291b6e0a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -42,7 +42,7 @@ jobs: imageName: "ubuntu-18.04" python.version: "3.6" # Python36Windows: - # imageName: "vs2017-win2016" + # imageName: "windows-2019" # python.version: "3.6" # Python36Mac: # imageName: "macos-10.14" @@ -51,7 +51,7 @@ jobs: # imageName: "ubuntu-18.04" # python.version: "3.7" Python37Windows: - imageName: "vs2017-win2016" + imageName: "windows-2019" python.version: "3.7" # Python37Mac: # imageName: "macos-10.14" @@ -60,7 +60,7 @@ jobs: # imageName: "ubuntu-18.04" # python.version: "3.8" # Python38Windows: - # imageName: "vs2017-win2016" + # imageName: "windows-2019" # python.version: "3.8" Python38Mac: imageName: "macos-10.14" @@ -68,12 +68,21 @@ jobs: Python39Linux: imageName: "ubuntu-18.04" python.version: "3.9" - Python39Windows: - imageName: "vs2017-win2016" - python.version: "3.9" - Python39Mac: - imageName: "macos-10.14" - python.version: "3.9" + # Python39Windows: + # imageName: "windows-2019" + # python.version: "3.9" + # Python39Mac: + # imageName: "macos-10.14" + # python.version: "3.9" + Python310Linux: + imageName: "ubuntu-20.04" + python.version: "3.10" + Python310Windows: + imageName: "windows-2019" + python.version: "3.10" + Python310Mac: + imageName: "macos-10.15" + python.version: "3.10" maxParallel: 4 pool: vmImage: $(imageName) diff --git a/build-constraints.txt b/build-constraints.txt index 23e660096..cf5fe3284 100644 --- a/build-constraints.txt +++ b/build-constraints.txt @@ -2,4 +2,5 @@ numpy==1.15.0; python_version<='3.7' numpy==1.17.3; python_version=='3.8' numpy==1.19.3; python_version=='3.9' -numpy; python_version>='3.10' +numpy==1.21.3; python_version=='3.10' +numpy; python_version>='3.11' diff --git a/pyproject.toml b/pyproject.toml index cb103de0a..f81484d43 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ requires = [ "cymem>=2.0.2,<2.1.0", "preshed>=3.0.2,<3.1.0", "murmurhash>=0.28.0,<1.1.0", - "thinc>=8.0.11,<8.1.0", + "thinc>=8.0.12,<8.1.0", "blis>=0.4.0,<0.8.0", "pathy", "numpy>=1.15.0", diff --git a/requirements.txt b/requirements.txt index 9bc39e323..36cf5c58e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ spacy-legacy>=3.0.8,<3.1.0 cymem>=2.0.2,<2.1.0 preshed>=3.0.2,<3.1.0 -thinc>=8.0.11,<8.1.0 +thinc>=8.0.12,<8.1.0 blis>=0.4.0,<0.8.0 ml_datasets>=0.2.0,<0.3.0 murmurhash>=0.28.0,<1.1.0 diff --git a/setup.cfg b/setup.cfg index b2b7e6be3..e5b03afe6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -21,6 +21,7 @@ classifiers = Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 + Programming Language :: Python :: 3.10 Topic :: Scientific/Engineering project_urls = Release notes = https://github.com/explosion/spaCy/releases @@ -37,14 +38,14 @@ 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.0.11,<8.1.0 + thinc>=8.0.12,<8.1.0 install_requires = # Our libraries spacy-legacy>=3.0.8,<3.1.0 murmurhash>=0.28.0,<1.1.0 cymem>=2.0.2,<2.1.0 preshed>=3.0.2,<3.1.0 - thinc>=8.0.11,<8.1.0 + thinc>=8.0.12,<8.1.0 blis>=0.4.0,<0.8.0 wasabi>=0.8.1,<1.1.0 srsly>=2.4.1,<3.0.0 @@ -95,6 +96,10 @@ cuda111 = cupy-cuda111>=5.0.0b4,<10.0.0 cuda112 = cupy-cuda112>=5.0.0b4,<10.0.0 +cuda113 = + cupy-cuda113>=5.0.0b4,<10.0.0 +cuda114 = + cupy-cuda114>=5.0.0b4,<10.0.0 # Language tokenizers with external dependencies ja = sudachipy>=0.4.9