Merge pull request #14 from posterior/20171106-fsaad-travis-ubuntu1404

20171106 fsaad travis ubuntu1404

.gitignore

@@ -11,3 +11,9 @@ temp.*
 *.swp
 doc/_build
 MANIFEST
+
+# Files generated by protobuf.
+distributions/io/schema_pb2.py
+include/distributions/io/schema.pb.cc
+include/distributions/io/schema.pb.h
+src/io/schema.pb.cc

.travis.yml

@@ -5,11 +5,10 @@ virtualenv:
   system_site_packages: true
 before_install:
   - pip uninstall numpy -y || echo 'numpy not installed'
-  - sudo add-apt-repository -y ppa:cython-dev/master-ppa
   - sudo apt-get update -qq
-  - sudo apt-get install -qq cython python-numpy python-scipy
-  - sudo apt-get install libprotobuf-dev libeigen3-dev
-  - pip install cpplint
+  - sudo apt-get install -qq cython python-numpy python-pil python-scipy
+  - sudo apt-get install libprotobuf-dev libeigen3-dev protobuf-compiler
+  - pip install cpplint pyflakes
 env:
   - FLAVOR=_cc
   - FLAVOR=_cc DISTRIBUTIONS_USE_PROTOBUF=1

Makefile

@@ -41,7 +41,7 @@ src/test_headers.cc: $(headers)
 	  > src/test_headers.cc
 	@echo '\nint main () { return 0; }' >> src/test_headers.cc
 
-prepare_cc: src/test_headers.cc FORCE
+prepare_cc: src/test_headers.cc protobuf FORCE
 	mkdir -p lib
 
 build/python: prepare_cc FORCE