From 98b9d387c97dca1b15cf24e561e93dd644e1e05b Mon Sep 17 00:00:00 2001 From: Ines Montani Date: Fri, 15 Nov 2019 00:33:44 +0100 Subject: [PATCH 1/5] Auto-format [ci skip] --- README.md | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 980fc5b0b..74d2d2166 100644 --- a/README.md +++ b/README.md @@ -72,21 +72,21 @@ it. ## Features -- Non-destructive **tokenization** -- **Named entity** recognition -- Support for **50+ languages** -- pretrained [statistical models](https://spacy.io/models) and word vectors -- State-of-the-art speed -- Easy **deep learning** integration -- Part-of-speech tagging -- Labelled dependency parsing -- Syntax-driven sentence segmentation -- Built in **visualizers** for syntax and NER -- Convenient string-to-hash mapping -- Export to numpy data arrays -- Efficient binary serialization -- Easy **model packaging** and deployment -- Robust, rigorously evaluated accuracy +- Non-destructive **tokenization** +- **Named entity** recognition +- Support for **50+ languages** +- pretrained [statistical models](https://spacy.io/models) and word vectors +- State-of-the-art speed +- Easy **deep learning** integration +- Part-of-speech tagging +- Labelled dependency parsing +- Syntax-driven sentence segmentation +- Built in **visualizers** for syntax and NER +- Convenient string-to-hash mapping +- Export to numpy data arrays +- Efficient binary serialization +- Easy **model packaging** and deployment +- Robust, rigorously evaluated accuracy 馃摉 **For more details, see the [facts, figures and benchmarks](https://spacy.io/usage/facts-figures).** @@ -96,10 +96,10 @@ it. For detailed installation instructions, see the [documentation](https://spacy.io/usage). -- **Operating system**: macOS / OS X 路 Linux 路 Windows (Cygwin, MinGW, Visual - Studio) -- **Python version**: Python 2.7, 3.5+ (only 64 bit) -- **Package managers**: [pip] 路 [conda] (via `conda-forge`) +- **Operating system**: macOS / OS X 路 Linux 路 Windows (Cygwin, MinGW, Visual + Studio) +- **Python version**: Python 2.7, 3.5+ (only 64 bit) +- **Package managers**: [pip] 路 [conda] (via `conda-forge`) [pip]: https://pypi.org/project/spacy/ [conda]: https://anaconda.org/conda-forge/spacy From e30d08410a4c905a1422a67aaf2b03a8601d33da Mon Sep 17 00:00:00 2001 From: Ines Montani Date: Fri, 15 Nov 2019 01:13:48 +0100 Subject: [PATCH 2/5] Add CI for Python 3.8 (#4479) * Add 3.8 classifier * Update azure-pipelines.yml * Remove 3.8 warning from docs [ci skip] --- README.md | 7 ------- azure-pipelines.yml | 9 +++++++++ website/docs/usage/index.md | 11 ----------- 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 74d2d2166..31dc78d63 100644 --- a/README.md +++ b/README.md @@ -104,13 +104,6 @@ For detailed installation instructions, see the [pip]: https://pypi.org/project/spacy/ [conda]: https://anaconda.org/conda-forge/spacy -> 鈿狅笍 **Important note for Python 3.8:** We can't yet ship pre-compiled binary -> wheels for spaCy that work on Python 3.8, as we're still waiting for our CI -> providers and other tooling to support it. This means that in order to run -> spaCy on Python 3.8, you'll need [a compiler installed](#source) and compile -> the library and its Cython dependencies locally. If this is causing problems -> for you, the easiest solution is to **use Python 3.7** in the meantime. - ### pip Using pip, spaCy releases are available as source packages and binary wheels (as diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 512c6414c..c7ea1d235 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -71,6 +71,15 @@ jobs: Python37Mac: imageName: 'macos-10.13' 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.13' + python.version: '3.8' maxParallel: 4 pool: vmImage: $(imageName) diff --git a/website/docs/usage/index.md b/website/docs/usage/index.md index 2b0045bc3..441297813 100644 --- a/website/docs/usage/index.md +++ b/website/docs/usage/index.md @@ -20,17 +20,6 @@ available over [pip](https://pypi.python.org/pypi/spacy) and > possible, the new docs also include notes on features that have changed in > v2.0, and features that were introduced in the new version. - - -We can't yet ship pre-compiled binary wheels for spaCy that work on Python 3.8, -as we're still waiting for our CI providers and other tooling to support it. -This means that in order to run spaCy on Python 3.8, you'll need -[a compiler installed](#source) and compile the library and its Cython -dependencies locally. If this is causing problems for you, the easiest solution -is to **use Python 3.7** in the meantime. - - - ## Quickstart {hidden="true"} import QuickstartInstall from 'widgets/quickstart-install.js' From 64f34d97b17d93942eff27d4c20f4fbed99fdd42 Mon Sep 17 00:00:00 2001 From: Ines Montani Date: Fri, 15 Nov 2019 01:50:55 +0100 Subject: [PATCH 3/5] Use newer pip to try fix wheel selection on 3.8 Windows --- azure-pipelines.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 512c6414c..0930d7524 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -81,10 +81,8 @@ jobs: versionSpec: '$(python.version)' architecture: 'x64' - # Downgrading pip is necessary to prevent a wheel version incompatiblity. - # Might be fixed in the future or some other way, so investigate again. - script: | - python -m pip install -U pip==18.1 setuptools + python -m pip install -U pip setuptools pip install -r requirements.txt displayName: 'Install dependencies' From 57af7c9d7f16cf4924d9a4d9acdb31ed9f1db8b0 Mon Sep 17 00:00:00 2001 From: Ines Montani Date: Fri, 15 Nov 2019 01:51:56 +0100 Subject: [PATCH 4/5] Don't upgrade pip --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 699384bd8..bc4db9d22 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -91,7 +91,7 @@ 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' From e5b25a9cee2c31ca68e0bd7b9db5df2d3171c853 Mon Sep 17 00:00:00 2001 From: Ines Montani Date: Fri, 15 Nov 2019 02:02:25 +0100 Subject: [PATCH 5/5] Update azure-pipelines.yml --- azure-pipelines.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index bc4db9d22..029cc9dd0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -35,24 +35,12 @@ jobs: dependsOn: 'Validate' strategy: matrix: - # Python 2.7 currently doesn't work because it seems to be a narrow - # unicode build, which causes problems with the regular expressions - - # Python27Linux: - # imageName: 'ubuntu-16.04' - # python.version: '2.7' - # Python27Mac: - # imageName: 'macos-10.13' - # python.version: '2.7' Python35Linux: imageName: 'ubuntu-16.04' python.version: '3.5' Python35Windows: imageName: 'vs2017-win2016' python.version: '3.5' - Python35Mac: - imageName: 'macos-10.13' - python.version: '3.5' Python36Linux: imageName: 'ubuntu-16.04' python.version: '3.6'