From 2229aba71c45ca66a37271b22f4a8d1c375bfa01 Mon Sep 17 00:00:00 2001 From: ines Date: Wed, 8 Nov 2017 01:06:30 +0100 Subject: [PATCH] Update website --- website/_includes/_mixins.jade | 10 ++++++++++ website/models/_data.json | 2 +- website/usage/_facts-figures/_benchmarks-models.jade | 8 ++++---- website/usage/_install/_instructions.jade | 8 ++++++++ website/usage/_install/_quickstart.jade | 8 +++++++- website/usage/_v2/_summary.jade | 6 +----- website/usage/index.jade | 2 ++ 7 files changed, 33 insertions(+), 11 deletions(-) diff --git a/website/_includes/_mixins.jade b/website/_includes/_mixins.jade index ac2d7e69e..c6f605cbc 100644 --- a/website/_includes/_mixins.jade +++ b/website/_includes/_mixins.jade @@ -708,3 +708,13 @@ mixin under-construction() | possible. Is there anything that you think should definitely | mentioned or explained here? Any examples you'd like to see? | #[strong Let us know] on the #[+a(gh("spacy") + "/issues") issue tracker]! + + +//- Legacy docs + +mixin legacy() + +aside("Looking for the old docs?", "📖") + | To help you make the transition from v1.x to v2.0, we've uploaded the + | old website to #[strong #[+a("https://legacy.spacy.io/docs") legacy.spacy.io]]. + | Wherever possible, the new docs also include notes on features that have + | changed in v2.0, and features that were introduced in the new version. diff --git a/website/models/_data.json b/website/models/_data.json index de960b5bb..3c4fb5bf2 100644 --- a/website/models/_data.json +++ b/website/models/_data.json @@ -44,7 +44,7 @@ "de": ["de_core_news_sm"], "es": ["es_core_news_sm", "es_core_news_md"], "pt": ["pt_core_news_sm"], - "fr": ["fr_core_news_sm"], + "fr": ["fr_core_news_sm", "fr_core_news_md"], "it": ["it_core_news_sm"], "nl": ["nl_core_news_sm"], "xx": ["xx_ent_wiki_sm"] diff --git a/website/usage/_facts-figures/_benchmarks-models.jade b/website/usage/_facts-figures/_benchmarks-models.jade index fc10c1b4f..4c5481f1c 100644 --- a/website/usage/_facts-figures/_benchmarks-models.jade +++ b/website/usage/_facts-figures/_benchmarks-models.jade @@ -18,7 +18,7 @@ p +table(["Model", "spaCy", "Type", "UAS", "NER F", "POS", "WPS", "Size"]) +row - +cell #[+a("/models/en#en_core_web_sm") #[code en_core_web_sm]] 2.0.0a8 + +cell #[+a("/models/en#en_core_web_sm") #[code en_core_web_sm]] 2.0.0 each data in ["2.x", "neural"] +cell("num")=data +cell("num") 91.7 @@ -28,7 +28,7 @@ p +cell("num") #[strong 35MB] +row - +cell #[+a("/models/en#en_core_web_lg") #[code en_core_web_lg]] 2.0.0a3 + +cell #[+a("/models/en#en_core_web_lg") #[code en_core_web_lg]] 2.0.0 each data in ["2.x", "neural"] +cell("num")=data +cell("num") #[strong 91.9] @@ -58,7 +58,7 @@ p +table(["Model", "spaCy", "Type", "UAS", "NER F", "POS", "WPS", "Size"]) +row - +cell #[+a("/models/es#es_core_news_sm") #[code es_core_news_sm]] 2.0.0a0 + +cell #[+a("/models/es#es_core_news_sm") #[code es_core_news_sm]] 2.0.0 +cell("num") 2.x +cell("num") neural +cell("num") 89.8 @@ -68,7 +68,7 @@ p +cell("num") #[strong 35MB] +row - +cell #[+a("/models/es#es_core_news_md") #[code es_core_news_md]] 2.0.0a0 + +cell #[+a("/models/es#es_core_news_md") #[code es_core_news_md]] 2.0.0 +cell("num") 2.x +cell("num") neural +cell("num") #[strong 90.2] diff --git a/website/usage/_install/_instructions.jade b/website/usage/_install/_instructions.jade index 5885ad85a..7e22554d2 100644 --- a/website/usage/_install/_instructions.jade +++ b/website/usage/_install/_instructions.jade @@ -30,6 +30,14 @@ p +h(3, "conda") conda +badge("https://anaconda.org/conda-forge/spacy/badges/version.svg", "https://anaconda.org/conda-forge/spacy") ++infobox("Important note", "⚠️") + | We're still waiting for spaCy v2.0 to + | #[+a("https://github.com/conda-forge/spacy-feedstock/pulls") go live] + | on #[code conda-forge], as there's currently a significant + | #[+a("https://www.traviscistatus.com/") backlog] of OSX builds on Travis. + | In the meantime, you can already try out the new version using pip. The + | conda download will follow as soon as possible. + p | Thanks to our great community, we've finally re-added conda support. You | can now install spaCy via #[code conda-forge]: diff --git a/website/usage/_install/_quickstart.jade b/website/usage/_install/_quickstart.jade index e6aa3d2c6..b9f5956c2 100644 --- a/website/usage/_install/_quickstart.jade +++ b/website/usage/_install/_quickstart.jade @@ -3,6 +3,12 @@ - QUICKSTART[QUICKSTART.length - 1].options = Object.keys(MODELS).map(m => ({ id: m, title: LANGUAGES[m] })) +quickstart(QUICKSTART, "Quickstart") + +qs({package: 'conda'}) # Important note: We're still waiting for spaCy v2.0 to go + +qs({package: 'conda'}) # live on conda, due to a backlog of OSX builds on Travis. + +qs({package: 'conda'}) # In the meantime, you can download spaCy via pip. + +qs({package: 'conda'}, "divider") + +qs({package: 'conda'}) pip install -U spacy + +qs({config: 'venv', python: 2}) python -m pip install -U virtualenv +qs({config: 'venv', python: 3}) python -m pip install -U venv +qs({config: 'venv', python: 2}) virtualenv .env @@ -12,7 +18,7 @@ +qs({config: 'venv', os: 'windows'}) .env\Scripts\activate +qs({package: 'pip'}) pip install -U spacy - +qs({package: 'conda'}) conda install -c conda-forge spacy + //-+qs({package: 'conda'}) conda install -c conda-forge spacy +qs({package: 'source'}) git clone https://github.com/explosion/spaCy +qs({package: 'source'}) cd spaCy diff --git a/website/usage/_v2/_summary.jade b/website/usage/_v2/_summary.jade index 063095549..a836a77ba 100644 --- a/website/usage/_v2/_summary.jade +++ b/website/usage/_v2/_summary.jade @@ -12,11 +12,7 @@ p | #[+a("/usage/spacy-101") spaCy 101 guide] that explains the most | important concepts with examples and illustrations. -+aside("Looking for the old docs?", "📖") - | To help you make the transition from v1.x to v2.0, we've uploaded the - | old website to #[strong #[+a("https://legacy.spacy.io/docs") legacy.spacy.io]]. - | Wherever possible, the new docs also include notes on features that have - | changed in v2.0, and features that were introduced in the new version. ++legacy +h(2, "summary") Summary diff --git a/website/usage/index.jade b/website/usage/index.jade index 495a9863b..936cb8e52 100644 --- a/website/usage/index.jade +++ b/website/usage/index.jade @@ -12,6 +12,8 @@ p | #[a(href="#source-ubuntu") Ubuntu], #[a(href="#source-osx") macOS/OS X] | and #[a(href="#source-windows") Windows] for details. ++legacy + +section("quickstart") include _install/_quickstart