From 8725d50d03cf21b37a78c1d2fa03ade055c8a821 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Sat, 21 Mar 2015 11:19:20 +1300 Subject: Add blinker dependency, start using it to refactor console app Blinker lets us set up a central pub/sub mechanism to disentangle our object structure. --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index fd3e6657..bffce805 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,8 @@ deps = { "pyOpenSSL>=0.14", "tornado>=4.0.2", "configargparse>=0.9.3", - "pyperclip>=1.5.8" + "pyperclip>=1.5.8", + "blinker>=1.3" } script_deps = { "mitmproxy": { -- cgit v1.2.3 From 6685c27697e4ffbe55ec8dc8f4f9b6043975239a Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Wed, 20 May 2015 13:12:41 +1200 Subject: docs: first-pass conversion to bootstrap3 Crappy default styling for now. --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index bffce805..9509ce7a 100644 --- a/setup.py +++ b/setup.py @@ -83,7 +83,8 @@ setup( "coveralls>=0.4.1", "pathod>=%s, <%s" % ( version.MINORVERSION, version.NEXT_MINORVERSION - ) + ), + "countershape" ], 'contentviews': [ "pyamf>=0.6.1", -- cgit v1.2.3 From a05a70d8168a07c92b2a3ecbbb1958d85532efe3 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Sat, 30 May 2015 12:03:28 +1200 Subject: Add coding style check, reformat. --- setup.py | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 9509ce7a..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,20 +79,15 @@ setup( "nose>=1.3.0", "nose-cov>=1.6", "coveralls>=0.4.1", - "pathod>=%s, <%s" % ( - version.MINORVERSION, version.NEXT_MINORVERSION - ), - "countershape" - ], + "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"]}) -- cgit v1.2.3 From 13ee54da86319e4a028279c4dce0967d8a786067 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Sun, 31 May 2015 13:13:12 +1200 Subject: Remove dependency on PyOpenSSL, move version check into netlib. There are a few more functions in the code that accesses PyOpenSSL directly that should probably also be moved to netlib. Later. --- setup.py | 1 - 1 file changed, 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 4fa64628..1a502b97 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,6 @@ if os.name != "nt": deps = { "netlib>=%s, <%s" % (version.MINORVERSION, version.NEXT_MINORVERSION), "pyasn1>0.1.2", - "pyOpenSSL>=0.14", "tornado>=4.0.2", "configargparse>=0.9.3", "pyperclip>=1.5.8", -- cgit v1.2.3 From fbb2633dd3e8bb4764e4d7627bec83bf73f4ae45 Mon Sep 17 00:00:00 2001 From: Thomas Kriechbaumer Date: Sun, 31 May 2015 12:39:37 +0200 Subject: replace contrib libraries with pypi dependencies --- setup.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'setup.py') 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": { -- cgit v1.2.3