Update commands for building from source

README.rst

@@ -247,17 +247,23 @@ details.
 .. code:: bash
 
     # make sure you are using recent pip/virtualenv versions
-    python -m pip install -U pip virtualenv
+    python -m pip install -U pip venv
     git clone https://github.com/explosion/spaCy
     cd spaCy
 
-    virtualenv .env
+    venv .env
     source .env/bin/activate
+    export PYTHONPATH=`pwd`
     pip install -r requirements.txt
-    pip install -e .
+    python setup.py build_ext --inplace
 
 Compared to regular install via pip, `requirements.txt <requirements.txt>`_
-additionally installs developer dependencies such as Cython.
+additionally installs developer dependencies such as Cython. For more details
+and instructions, see the documentation on
+`compiling spaCy from source <https://spacy.io/usage/#source>`_ and the
+`quickstart widget <https://alpha.spacy.io/usage/#section-quickstart>`_ to get
+the right commands for your platform and Python version.
+
 Instead of the above verbose commands, you can also use the following
 `Fabric <http://www.fabfile.org/>`_ commands. All commands assume that your
 ``virtualenv`` is located in a directory ``.env``. If you're using a different

website/usage/_install/_instructions.jade

@@ -115,23 +115,23 @@ p
     |  #[a(href="#source-windows") Windows] for details.
 
 +code(false, "bash").
-    # make sure you are using recent pip/virtualenv versions
-    python -m pip install -U pip virtualenv
-    git clone #{gh("spaCy")}
-    cd spaCy
+    python -m pip install -U pip venv              # update pip & virtualenv
+    git clone #{gh("spaCy")}   # clone spaCy
+    cd spaCy                                       # navigate into directory
 
-    virtualenv .env
-    source .env/bin/activate
-    pip install -r requirements.txt
-    pip install -e .
+    venv .env                                      # create environment in .env
+    source .env/bin/activate                       # activate virtual environment
+    export PYTHONPATH=`pwd`                        # set Python path to spaCy directory
+    pip install -r requirements.txt                # install all requirements
+    python setup.py build_ext --inplace            # compile spaCy
 
 p
-    |  Compared to regular install via pip,
-    |  #[+a(gh("spaCy", "requirements.txt")) requirements.txt]
-    |  additionally installs developer dependencies such as Cython.
-
-p
-    |  Instead of the above verbose commands, you can also use the following
+    |  Compared to regular install via pip, the
+    |  #[+src(gh("spaCy", "requirements.txt")) #[code requirements.txt]]
+    |  additionally installs developer dependencies such as Cython. See the
+    |  the #[+a("#section-quickstart") quickstart widget] to get the right
+    |  commands for your platform and Python version. Instead of the above
+    |  verbose commands, you can also use the following
     |  #[+a("http://www.fabfile.org/") Fabric] commands:
 
 +table(["Command", "Description"])

website/usage/_install/_quickstart.jade

@@ -21,7 +21,7 @@
     +qs({package: 'source'}) cd spaCy
     +qs({package: 'source'}) export PYTHONPATH=`pwd`
     +qs({package: 'source'}) pip install -r requirements.txt
-    +qs({package: 'source'}) pip install -e .
+    +qs({package: 'source'}) python setup.py build_ext --inplace
 
     for _, model in MODELS
         +qs({model: model}) spacy download #{model}