Merge pull request #6333 from adrianeboyd/chore/python39

This commit is contained in:
Ines Montani 2020-12-17 22:11:57 +11:00 committed by GitHub
commit e9b0963827
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 39 additions and 45 deletions

View File

@ -37,40 +37,39 @@ jobs:
Python36Linux:
imageName: "ubuntu-16.04"
python.version: "3.6"
Python36Windows:
# Python36Windows:
# imageName: "vs2017-win2016"
# python.version: "3.6"
# Python36Mac:
# imageName: "macos-10.14"
# python.version: "3.6"
# Python37Linux:
# imageName: "ubuntu-16.04"
# python.version: "3.7"
Python37Windows:
imageName: "vs2017-win2016"
python.version: "3.6"
Python36Mac:
imageName: "macos-10.14"
python.version: "3.6"
# Don't test on 3.7 for now to speed up builds
# Python37Linux:
# imageName: 'ubuntu-16.04'
# python.version: '3.7'
# Python37Windows:
# imageName: 'vs2017-win2016'
# python.version: '3.7'
# Python37Mac:
# imageName: 'macos-10.14'
# python.version: '3.7'
Python38Linux:
imageName: "ubuntu-16.04"
python.version: "3.8"
Python38Windows:
imageName: "vs2017-win2016"
python.version: "3.8"
python.version: "3.7"
# Python37Mac:
# imageName: "macos-10.14"
# python.version: "3.7"
# Python38Linux:
# imageName: "ubuntu-16.04"
# python.version: "3.8"
# Python38Windows:
# imageName: "vs2017-win2016"
# python.version: "3.8"
Python38Mac:
imageName: "macos-10.14"
python.version: "3.8"
# Python39Linux:
# imageName: "ubuntu-16.04"
# python.version: "3.9"
# Python39Windows:
# imageName: "vs2017-win2016"
# python.version: "3.9"
# Python39Mac:
# imageName: "macos-10.14"
# python.version: "3.9"
Python39Linux:
imageName: "ubuntu-16.04"
python.version: "3.9"
Python39Windows:
imageName: "vs2017-win2016"
python.version: "3.9"
Python39Mac:
imageName: "macos-10.14"
python.version: "3.9"
maxParallel: 4
pool:
vmImage: $(imageName)
@ -82,13 +81,12 @@ jobs:
architecture: "x64"
- script: |
python -m pip install -U pip setuptools
python -m pip install -U setuptools
pip install -r requirements.txt
displayName: "Install dependencies"
condition: not(eq(variables['python.version'], '3.5'))
- script: |
python setup.py build_ext --inplace -j 2
python setup.py build_ext --inplace
python setup.py sdist --formats=gztar
displayName: "Compile and build sdist"
@ -106,7 +104,6 @@ jobs:
SDIST=$(python -c "import os;print(os.listdir('./dist')[-1])" 2>&1)
pip install dist/$SDIST
displayName: "Install from sdist"
condition: not(eq(variables['python.version'], '3.5'))
- script: |
pip install -r requirements.txt

View File

@ -5,12 +5,9 @@ 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.0rc2,<8.1.0",
"thinc>=8.0.0rc3,<8.1.0",
"blis>=0.4.0,<0.8.0",
"pathy",
"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.15.0",
]
build-backend = "setuptools.build_meta"

View File

@ -1,7 +1,7 @@
# Our libraries
cymem>=2.0.2,<2.1.0
preshed>=3.0.2,<3.1.0
thinc>=8.0.0rc2,<8.1.0
thinc>=8.0.0rc3,<8.1.0
blis>=0.4.0,<0.8.0
ml_datasets==0.2.0a0
murmurhash>=0.28.0,<1.1.0
@ -14,7 +14,7 @@ pathy
numpy>=1.15.0
requests>=2.13.0,<3.0.0
tqdm>=4.38.0,<5.0.0
pydantic>=1.5.0,<1.7.0
pydantic>=1.7.1,<1.8.0
jinja2
# Official Python utilities
setuptools

View File

@ -34,13 +34,13 @@ 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.0rc2,<8.1.0
thinc>=8.0.0rc3,<8.1.0
install_requires =
# Our libraries
murmurhash>=0.28.0,<1.1.0
cymem>=2.0.2,<2.1.0
preshed>=3.0.2,<3.1.0
thinc>=8.0.0rc2,<8.1.0
thinc>=8.0.0rc3,<8.1.0
blis>=0.4.0,<0.8.0
wasabi>=0.8.0,<1.1.0
srsly>=2.3.0,<3.0.0
@ -51,7 +51,7 @@ install_requires =
tqdm>=4.38.0,<5.0.0
numpy>=1.15.0
requests>=2.13.0,<3.0.0
pydantic>=1.5.0,<1.7.0
pydantic>=1.7.1,<1.8.0
jinja2
# Official Python utilities
setuptools

View File

@ -1,6 +1,6 @@
# fmt: off
__title__ = "spacy-nightly"
__version__ = "3.0.0rc2"
__version__ = "3.0.0rc3"
__download_url__ = "https://github.com/explosion/spacy-models/releases/download"
__compatibility__ = "https://raw.githubusercontent.com/explosion/spacy-models/master/compatibility.json"
__projects__ = "https://github.com/explosion/projects"