Merge branch 'master' into v2.3.x

.travis.yml

@@ -8,11 +8,11 @@ python:
 os:
   - linux
 install:
-  - "pip install -r requirements.txt"
-  - "python setup.py build_ext --inplace"
-  - "pip install -e ."
+  - "python -m pip install -U pip setuptools"
+  - "pip install -e . --prefer-binary"
 script:
   - "cat /proc/cpuinfo | grep flags | head -n 1"
+  - "pip install -r requirements.txt"
   - "python -m pytest --tb=native spacy"
 branches:
   except:

spacy/cli/train.py

@@ -137,9 +137,6 @@ def train(
         output_path.mkdir()
         msg.good("Created output directory: {}".format(output_path))
 
-    tag_map = {}
-    if tag_map_path is not None:
-        tag_map = srsly.read_json(tag_map_path)
     # Take dropout and batch size as generators of values -- dropout
     # starts high and decays sharply, to force the optimizer to explore.
     # Batch size starts at 1 and grows, so that we make updates quickly
@@ -250,8 +247,10 @@ def train(
                 pipe_cfg = {}
             nlp.add_pipe(nlp.create_pipe(pipe, config=pipe_cfg))
 
-    # Replace tag map with provided mapping
-    nlp.vocab.morphology.load_tag_map(tag_map)
+    if tag_map_path is not None:
+        tag_map = srsly.read_json(tag_map_path)
+        # Replace tag map with provided mapping
+        nlp.vocab.morphology.load_tag_map(tag_map)
 
     # Create empty extra lexeme tables so the data from spacy-lookups-data
     # isn't loaded if these features are accessed