aboutsummaryrefslogtreecommitdiffstats
path: root/setup.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2015-06-04 13:30:18 +1200
committerAldo Cortesi <aldo@nullcube.com>2015-06-04 13:30:18 +1200
commit783e904b924d7f8d4448512b03383d429f5cf7de (patch)
tree0b5bfd29f218776023d44e417e3957d29aef363c /setup.py
parent249bb4a2ac6dc509ded59f6cafe5e1a25f568098 (diff)
parentfbb2633dd3e8bb4764e4d7627bec83bf73f4ae45 (diff)
downloadmitmproxy-783e904b924d7f8d4448512b03383d429f5cf7de.tar.gz
mitmproxy-783e904b924d7f8d4448512b03383d429f5cf7de.tar.bz2
mitmproxy-783e904b924d7f8d4448512b03383d429f5cf7de.zip
Merge pull request #603 from Kriechi/remove-contrib
replace contrib libraries with pypi dependencies
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/setup.py b/setup.py
index 1a502b97..1c15eb80 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,9 @@ deps = {
"tornado>=4.0.2",
"configargparse>=0.9.3",
"pyperclip>=1.5.8",
- "blinker>=1.3"
+ "blinker>=1.3",
+ "pyparsing>=1.5.2",
+ "html2text>=2015.4.14"
}
script_deps = {
"mitmproxy": {