From b591f2a83a3066581124cbb9f4d7f07fe33f1563 Mon Sep 17 00:00:00 2001
From: Mark Mossberg <mark.mossberg@gmail.com>
Date: Wed, 1 Mar 2017 11:22:04 -0500
Subject: [PATCH] Add unicorn to required deps (#31)

* Add unicorn to python deps

* Update readme

* Add deps to setup.py

* test letting pip install install deps in travis
---
 .travis.yml      | 1 -
 README.md        | 4 ----
 requirements.txt | 1 +
 setup.py         | 5 +++++
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ad80dc5..dfbd169 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,6 @@ python:
 - 2.7
 install:
 - travis_retry pip install -U pip
-- travis_retry pip install -r requirements.txt
 - travis_retry pip install --no-binary keystone-engine keystone-engine
 - travis_retry pip install coverage
 - travis_retry pip install .
diff --git a/README.md b/README.md
index c4908a6..2b0b3d1 100644
--- a/README.md
+++ b/README.md
@@ -42,10 +42,6 @@ Manticore is officially supported on Linux and uses Python 2.7.
 - Z3 Theorem Prover: Download the latest release for your platform from https://github.com/Z3Prover/z3/releases/latest, and place the enclosed `z3` binary in your `$PATH`.
   - Alternatively, CVC4 or Yices can be used.
 
-### optional dependencies
-
-- Unicorn Emulation Engine: Allows Manticore to handle unimplemented instructions
-
 ### development dependencies
 
 - keystone: Used in unit tests
diff --git a/requirements.txt b/requirements.txt
index 7cce892..3d52887 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,3 +4,4 @@
 # dependencies
 capstone
 pyelftools
+unicorn
diff --git a/setup.py b/setup.py
index 1cae974..aceab22 100644
--- a/setup.py
+++ b/setup.py
@@ -4,6 +4,11 @@ setup(
     name='Manticore',
     version='0.1.0',
     packages=find_packages(),
+    install_requires=[
+        'capstone',
+        'pyelftools',
+        'unicorn'
+    ],
     entry_points={
         'console_scripts': [
             'manticore = manticore.__main__:main'