mirror of https://github.com/explosion/spaCy.git
Remove blis python version constraints (#6522)
* Remove blis version constraints After updating the blis sdist in v0.7.4, remove python version constraints for blis build and install dependencies. * Install sdist with --prefer-binary for python 3.5 * Fix duplicate sdist install steps * Fix sdist install step types * Fix blis pins in requirements.txt * Remove wheel hack for python 3.5 from CI
This commit is contained in:
parent
4e77349106
commit
df4891bed1
|
@ -89,10 +89,16 @@ jobs:
|
||||||
versionSpec: '$(python.version)'
|
versionSpec: '$(python.version)'
|
||||||
architecture: 'x64'
|
architecture: 'x64'
|
||||||
|
|
||||||
- script: |
|
- script: python -m pip install -U pip setuptools
|
||||||
python -m pip install -U pip setuptools
|
displayName: 'Update pip'
|
||||||
pip install -r requirements.txt --prefer-binary
|
|
||||||
|
- script: pip install -r requirements.txt --prefer-binary
|
||||||
|
displayName: 'Install dependencies (python 3.5: prefer binary)'
|
||||||
|
condition: eq(variables['python.version'], '3.5')
|
||||||
|
|
||||||
|
- script: pip install -r requirements.txt
|
||||||
displayName: 'Install dependencies'
|
displayName: 'Install dependencies'
|
||||||
|
condition: not(eq(variables['python.version'], '3.5'))
|
||||||
|
|
||||||
- script: |
|
- script: |
|
||||||
python setup.py build_ext --inplace -j 2
|
python setup.py build_ext --inplace -j 2
|
||||||
|
@ -109,15 +115,17 @@ jobs:
|
||||||
pip uninstall -y -r installed.txt
|
pip uninstall -y -r installed.txt
|
||||||
displayName: 'Uninstall all packages'
|
displayName: 'Uninstall all packages'
|
||||||
|
|
||||||
- script: |
|
- bash: |
|
||||||
pip install wheel
|
SDIST=$(python -c "import os;print(os.listdir('./dist')[-1])" 2>&1)
|
||||||
condition: and(eq(variables['os'], 'linux'), eq(variables['python.version'], '3.5'))
|
pip install dist/$SDIST --prefer-binary
|
||||||
displayName: 'Hack: install wheel for python 3.5'
|
displayName: 'Install from sdist (python 3.5: prefer binary)'
|
||||||
|
condition: eq(variables['python.version'], '3.5')
|
||||||
|
|
||||||
- bash: |
|
- bash: |
|
||||||
SDIST=$(python -c "import os;print(os.listdir('./dist')[-1])" 2>&1)
|
SDIST=$(python -c "import os;print(os.listdir('./dist')[-1])" 2>&1)
|
||||||
pip install dist/$SDIST
|
pip install dist/$SDIST
|
||||||
displayName: 'Install from sdist'
|
displayName: 'Install from sdist'
|
||||||
|
condition: not(eq(variables['python.version'], '3.5'))
|
||||||
|
|
||||||
- script: |
|
- script: |
|
||||||
pip install -r requirements.txt --prefer-binary
|
pip install -r requirements.txt --prefer-binary
|
||||||
|
|
|
@ -6,8 +6,7 @@ requires = [
|
||||||
"preshed>=3.0.2,<3.1.0",
|
"preshed>=3.0.2,<3.1.0",
|
||||||
"murmurhash>=0.28.0,<1.1.0",
|
"murmurhash>=0.28.0,<1.1.0",
|
||||||
"thinc>=7.4.1,<7.5.0",
|
"thinc>=7.4.1,<7.5.0",
|
||||||
"blis>=0.4.0,<0.8.0; python_version >= '3.6'",
|
"blis>=0.4.0,<0.8.0",
|
||||||
"blis>=0.4.0,<0.5.0; python_version < '3.6'",
|
|
||||||
"numpy>=1.15.0",
|
"numpy>=1.15.0",
|
||||||
]
|
]
|
||||||
build-backend = "setuptools.build_meta"
|
build-backend = "setuptools.build_meta"
|
||||||
|
|
|
@ -2,8 +2,7 @@
|
||||||
cymem>=2.0.2,<2.1.0
|
cymem>=2.0.2,<2.1.0
|
||||||
preshed>=3.0.2,<3.1.0
|
preshed>=3.0.2,<3.1.0
|
||||||
thinc>=7.4.1,<7.5.0
|
thinc>=7.4.1,<7.5.0
|
||||||
blis>=0.4.0,<0.8.0; python_version >= "3.6"
|
blis>=0.4.0,<0.8.0
|
||||||
blis>=0.4.0,<0.5.0; python_version < "3.6"
|
|
||||||
murmurhash>=0.28.0,<1.1.0
|
murmurhash>=0.28.0,<1.1.0
|
||||||
wasabi>=0.4.0,<1.1.0
|
wasabi>=0.4.0,<1.1.0
|
||||||
srsly>=1.0.2,<1.1.0
|
srsly>=1.0.2,<1.1.0
|
||||||
|
|
|
@ -47,8 +47,7 @@ install_requires =
|
||||||
cymem>=2.0.2,<2.1.0
|
cymem>=2.0.2,<2.1.0
|
||||||
preshed>=3.0.2,<3.1.0
|
preshed>=3.0.2,<3.1.0
|
||||||
thinc>=7.4.1,<7.5.0
|
thinc>=7.4.1,<7.5.0
|
||||||
blis>=0.4.0,<0.8.0; python_version >= "3.6"
|
blis>=0.4.0,<0.8.0
|
||||||
blis>=0.4.0,<0.5.0; python_version < "3.6"
|
|
||||||
wasabi>=0.4.0,<1.1.0
|
wasabi>=0.4.0,<1.1.0
|
||||||
srsly>=1.0.2,<1.1.0
|
srsly>=1.0.2,<1.1.0
|
||||||
catalogue>=0.0.7,<1.1.0
|
catalogue>=0.0.7,<1.1.0
|
||||||
|
|
Loading…
Reference in New Issue