From 7075f4dfec749258f6f23c90f0dc2d1e3a11d0f6 Mon Sep 17 00:00:00 2001
From: Maximilian Hils <git@maximilianhils.com>
Date: Tue, 26 Dec 2017 19:42:47 +0100
Subject: remove rtool's setup.py, embrace tox

---
 release/setup.py | 18 ------------------
 tox.ini          |  8 +++-----
 2 files changed, 3 insertions(+), 23 deletions(-)
 delete mode 100644 release/setup.py

diff --git a/release/setup.py b/release/setup.py
deleted file mode 100644
index 531faaaf..00000000
--- a/release/setup.py
+++ /dev/null
@@ -1,18 +0,0 @@
-from setuptools import setup
-
-setup(
-    name='mitmproxy-rtool',
-    version="1.0",
-    py_modules=["rtool"],
-    install_requires=[
-        "click>=6.2, <7.0",
-        "twine>=1.6.5, <1.10",
-        "pysftp==0.2.8",
-        "cryptography>=2.1.4, <2.2",
-    ],
-    entry_points={
-        "console_scripts": [
-            "rtool=rtool:cli",
-        ],
-    },
-)
diff --git a/tox.ini b/tox.ini
index 681e95f1..f1e06a6c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -53,12 +53,10 @@ commands =
 [testenv:rtool]
 deps =
   -rrequirements.txt
-  -e./release
-  # The 3.2 release is broken 
-  # the next commit after this updates the bootloaders, which then segfault!
-  # https://github.com/pyinstaller/pyinstaller/issues/2232
   pyinstaller==3.3.1
+  twine==1.9.1
+  pysftp==0.2.8
 
 commands =
   mitmdump --version
-  rtool {posargs}
+  python ./release/rtool.py {posargs}
-- 
cgit v1.2.3