aboutsummaryrefslogtreecommitdiffstats
path: root/setup.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-05-31 01:51:31 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-05-31 01:51:31 +0200
commitec92fca8c030fe5971a034a658033f70965b990a (patch)
treeef9a2049eeab539d13e1f9662fd51220ab4ee817 /setup.py
parent0f8e8ee1ad667c8d747d5876f9b630ecbc01d7e9 (diff)
parenta05a70d8168a07c92b2a3ecbbb1958d85532efe3 (diff)
downloadmitmproxy-ec92fca8c030fe5971a034a658033f70965b990a.tar.gz
mitmproxy-ec92fca8c030fe5971a034a658033f70965b990a.tar.bz2
mitmproxy-ec92fca8c030fe5971a034a658033f70965b990a.zip
Merge branch 'master' of github.com:mitmproxy/mitmproxy
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py22
1 files changed, 8 insertions, 14 deletions
diff --git a/setup.py b/setup.py
index bffce805..4fa64628 100644
--- a/setup.py
+++ b/setup.py
@@ -67,13 +67,11 @@ setup(
"Topic :: Internet",
"Topic :: Internet :: WWW/HTTP",
"Topic :: Internet :: Proxy Servers",
- "Topic :: Software Development :: Testing"
- ],
+ "Topic :: Software Development :: Testing"],
packages=find_packages(),
include_package_data=True,
entry_points={
- 'console_scripts': console_scripts
- },
+ 'console_scripts': console_scripts},
install_requires=list(deps),
extras_require={
'dev': [
@@ -81,19 +79,15 @@ setup(
"nose>=1.3.0",
"nose-cov>=1.6",
"coveralls>=0.4.1",
- "pathod>=%s, <%s" % (
- version.MINORVERSION, version.NEXT_MINORVERSION
- )
- ],
+ "pathod>=%s, <%s" %
+ (version.MINORVERSION,
+ version.NEXT_MINORVERSION),
+ "countershape"],
'contentviews': [
"pyamf>=0.6.1",
"protobuf>=2.5.0",
- "cssutils>=1.0"
- ],
+ "cssutils>=1.0"],
'examples': [
"pytz",
"harparser",
- "beautifulsoup4"
- ]
- }
-)
+ "beautifulsoup4"]})