aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2017-12-26 19:42:47 +0100
committerMaximilian Hils <git@maximilianhils.com>2017-12-29 22:56:11 +0100
commit7075f4dfec749258f6f23c90f0dc2d1e3a11d0f6 (patch)
tree5d4c66e95d4f793caf478fed36cb18aaae3c4fde
parentf6a308d31adbbeb16fa3378a59589afef7a4ee90 (diff)
downloadmitmproxy-7075f4dfec749258f6f23c90f0dc2d1e3a11d0f6.tar.gz
mitmproxy-7075f4dfec749258f6f23c90f0dc2d1e3a11d0f6.tar.bz2
mitmproxy-7075f4dfec749258f6f23c90f0dc2d1e3a11d0f6.zip
remove rtool's setup.py, embrace tox
-rw-r--r--release/setup.py18
-rw-r--r--tox.ini8
2 files changed, 3 insertions, 23 deletions
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}