aboutsummaryrefslogtreecommitdiffstats
path: root/setup.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-07-28 15:37:06 -0700
committerGitHub <noreply@github.com>2016-07-28 15:37:06 -0700
commite800f321afacbfef2283ff60074b980e0bd9c3ab (patch)
tree789860ee120158fb04e8852774e6824340d539be /setup.py
parent83102b853f2a8dad3d4c5216db39c6e65ee9ba2b (diff)
parent1cffa5f46b84928f1dd211806122d01700345b40 (diff)
downloadmitmproxy-e800f321afacbfef2283ff60074b980e0bd9c3ab.tar.gz
mitmproxy-e800f321afacbfef2283ff60074b980e0bd9c3ab.tar.bz2
mitmproxy-e800f321afacbfef2283ff60074b980e0bd9c3ab.zip
Merge pull request #1436 from dufferzafar/jsbeautifier
Use jsbeautifier from pip
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/setup.py b/setup.py
index 23eb3b26..a1580d8b 100644
--- a/setup.py
+++ b/setup.py
@@ -67,10 +67,12 @@ setup(
"configargparse>=0.10, <0.11",
"construct>=2.5.2, <2.6",
"cryptography>=1.3, <1.5",
+ "cssutils>=1.0.1, <1.1",
"Flask>=0.10.1, <0.12",
"h2>=2.4.0, <3",
"html2text>=2016.1.8, <=2016.5.29",
"hyperframe>=4.0.1, <5",
+ "jsbeautifier>=1.6.3, <1.7",
"lxml>=3.5.0, <=3.6.0", # no wheels for 3.6.1 yet.
"Pillow>=3.2, <3.4",
"passlib>=1.6.5, <1.7",
@@ -110,7 +112,6 @@ setup(
"sphinx_rtd_theme>=0.1.9, <0.2",
],
'contentviews': [
- "cssutils>=1.0.1, <1.1",
# TODO: Find Python 3 replacements
# "protobuf>=2.6.1, <2.7",
# "pyamf>=0.8.0, <0.9",