From 8f8c1400d185d129e8f94fe1f8a5d80dfe9a2440 Mon Sep 17 00:00:00 2001
From: Omar Abdelhafith <omar.abdelhafith@mttnow.com>
Date: Sun, 28 Jun 2015 23:58:14 +0100
Subject: [PATCH] Adding mitmprom to the requirements of setup.py

---
 .travis.yml | 15 ++++++++++-----
 setup.py    |  9 +++++----
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 109e6d6..dbdf812 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,16 @@
-# Config file for automatic testing at travis-ci.org
-
 language: python
 
 python:
-  - "2.7.9"
+  - "2.6"
   - "2.7"
+  - "2.7.9"
+
+env:
+    - PIP_USE_MIRRORS=true
 
-install: pip install -r requirements.txt
+install:
+  - python setup.py -q build
+  - python setup.py -q install
 
-script: py.test
+script:
+  - py.test
diff --git a/setup.py b/setup.py
index 2a9fa7c..5b35617 100755
--- a/setup.py
+++ b/setup.py
@@ -17,9 +17,9 @@
 requirements = [
     "mock",
     "cherrypy",
-    "netlib",
     "termcolor",
-    "watchdog"
+    "watchdog",
+    "mitmproxy"
 ]
 
 test_requirements = [
@@ -29,8 +29,8 @@
 
 setup(
     name='mockpy',
-    version='0.1.1',
-    description="Mockpy is an work in progress (Wip) open source tool to quickly create mock servers. Mockpy is inspired from wiremock and uses libmproxy for the proxy functionality",
+    version='0.1.4',
+    description="Mockpy is an work in progress open source tool to quickly create mock servers. Mockpy is inspired from wiremock and uses libmproxy for the proxy functionality",
     long_description=readme + '\n\n' + history,
     author="Omar Abdelhafith",
     author_email='o.arrabi@me.com',
@@ -55,6 +55,7 @@
         "Programming Language :: Python :: 2",
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 2.7.9',
     ],
     test_suite='tests',
     tests_require=test_requirements,