diff --git a/website/usage/_install/_instructions.jade b/website/usage/_install/_instructions.jade index d325e0ff4..770aba35c 100644 --- a/website/usage/_install/_instructions.jade +++ b/website/usage/_install/_instructions.jade @@ -30,19 +30,12 @@ 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 go live on #[code conda-forge], - | as there's currently a 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]: +code(false, "bash"). - conda config --add channels conda-forge - conda install spacy + conda install -c conda-forge spacy p | For the feedstock including the build recipe and configuration, check out diff --git a/website/usage/_install/_quickstart.jade b/website/usage/_install/_quickstart.jade index b679d5a08..f2d4383a4 100644 --- a/website/usage/_install/_quickstart.jade +++ b/website/usage/_install/_quickstart.jade @@ -3,12 +3,6 @@ - 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 @@ -18,7 +12,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