From 18346d3126fc2e7eb64804e975fac3e94c6f0696 Mon Sep 17 00:00:00 2001
From: Paul Yang <zapionator@gmail.com>
Date: Mon, 13 Feb 2017 16:18:18 +0800
Subject: [PATCH] Updating dependencies and using requirements.txt

---
 benchtester/MarionetteTest.py    |  2 +-
 benchtester/test_memory_usage.py |  2 +-
 requirements.txt                 |  6 +++---
 setup.py                         | 17 +++++++++--------
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/benchtester/MarionetteTest.py b/benchtester/MarionetteTest.py
index 209ad4f..ce16207 100644
--- a/benchtester/MarionetteTest.py
+++ b/benchtester/MarionetteTest.py
@@ -12,7 +12,7 @@
 import shutil
 
 import mozprofile
-from marionette.runtests import MarionetteTestRunner
+from marionette_harness.runtests import MarionetteTestRunner
 
 
 class MarionetteTest(BenchTester.BenchTest):
diff --git a/benchtester/test_memory_usage.py b/benchtester/test_memory_usage.py
index b01281c..8b74337 100644
--- a/benchtester/test_memory_usage.py
+++ b/benchtester/test_memory_usage.py
@@ -6,7 +6,7 @@
 import os
 import sys
 
-from marionette import MarionetteTestCase
+from marionette_harness import MarionetteTestCase
 from marionette_driver import Actions
 from marionette_driver.errors import JavascriptException, ScriptTimeoutException
 import mozlog.structured
diff --git a/requirements.txt b/requirements.txt
index 048c394..da5d6db 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 boto==2.39.0
-marionette-client==3.1.0
+marionette-harness==4.0
 mercurial==3.2.4
-mozdownload==1.20.2
+mozdownload==1.21
 MozillaPulse==1.0.1
-treeherder-client==3.0.0
+treeherder-client==3.1.0
diff --git a/setup.py b/setup.py
index 8d557f0..1b888aa 100644
--- a/setup.py
+++ b/setup.py
@@ -2,8 +2,16 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+import os
 from setuptools import setup
 
+THIS_DIR = os.path.dirname(os.path.realpath(__name__))
+
+
+def read(*parts):
+    with open(os.path.join(THIS_DIR, *parts)) as f:
+        return f.read()
+
 setup(
     name="awsy",
     version="0.0.1",
@@ -17,12 +25,5 @@
       "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)"
     ],
     packages=["benchtester"],
-    install_requires=[
-      "boto",
-      "marionette-client",
-      "mercurial",
-      "mozdownload",
-      "MozillaPulse",
-      "treeherder-client>=3.0.0"
-    ],
+    install_requires=read('requirements.txt').splitlines(),
 )