Update build

ageitgey · ageitgey · commit a712ece7051f · 2017-03-13T09:02:37.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,3 @@
-# Config file for automatic testing at travis-ci.org
-# This file will be regenerated if you run travis_pypi_setup.py
-
 language: python
 python:
   - "2.7"
@@ -9,8 +6,8 @@ python:
   - "3.5"
   - "3.6"
 
-# command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
+before_install: pip install git+https://github.com/ageitgey/face_recognition_models
+
 install: pip install -r requirements.txt --use-mirrors
 
-# command to run tests, e.g. python setup.py test
 script: make test
diff --git a/README.md b/README.md
@@ -66,13 +66,19 @@ results = face_recognition.compare_faces([biden_encoding], unknown_encoding)
 Python 3 is fully supported. Python 2 should also work. Only macOS and
 Linux are tested. I have no idea if this will work on Windows.
 
-You can install this module from pypi using `pip3` (or `pip2` for Python 2):
+1. First, install the required machine learning models using `pip3` (or `pip2` for Python 2):
 
 ```bash
-$ pip3 install face_recognition
+pip3 install git+https://github.com/ageitgey/face_recognition_models
 ```
 
-It's very likely that you will run into problems when pip tries to compile
+2. Then you can install this module from pypi using `pip3` (or `pip2` for Python 2):
+
+```bash
+pip3 install face_recognition
+```
+
+NOTE: It's very likely that you will run into problems when pip tries to compile
 the `dlib` dependency. If that happens, check out this guide to installing
 dlib from source instead to fix the error:
 
diff --git a/face_recognition/api.py b/face_recognition/api.py
@@ -3,7 +3,14 @@
 import scipy.misc
 import dlib
 import numpy as np
-import face_recognition_models
+
+try:
+    import face_recognition_models
+except:
+    print("Please install `face_recognition_models` with this command before using `face_recognition`:")
+    print()
+    print("pip install git+https://github.com/ageitgey/face_recognition_models")
+    quit()
 
 predictor_model = face_recognition_models.pose_predictor_model_location()
 pose_predictor = dlib.shape_predictor(predictor_model)
