diff --git a/libmproxy/main.py b/libmproxy/main.py index d7c5f22cf..3c908ed9f 100644 --- a/libmproxy/main.py +++ b/libmproxy/main.py @@ -38,10 +38,6 @@ def get_server(dummy_server, options): def mitmproxy(args=None): # pragma: nocover - if os.name == "nt": - print("Error: mitmproxy's console interface is not supported on Windows. " - "You can run mitmdump or mitmweb instead.", file=sys.stderr) - sys.exit(1) from . import console check_pyopenssl_version() diff --git a/setup.py b/setup.py index 8ae24c4eb..34c7607b3 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,7 @@ from setuptools import setup, find_packages from codecs import open import os +import sys from libmproxy import version # Based on https://github.com/pypa/sampleproject/blob/master/setup.py @@ -11,7 +12,66 @@ here = os.path.abspath(os.path.dirname(__file__)) with open(os.path.join(here, 'README.rst'), encoding='utf-8') as f: long_description = f.read() -console_scripts = ["%s = libmproxy.main:%s" % (s, s) for s in ("mitmproxy", "mitmdump", "mitmweb")] +# Core dependencies +deps = { + "netlib>=%s, <%s" % (version.MINORVERSION, version.NEXT_MINORVERSION), + "pyasn1~=0.1.9", + "tornado~=4.3.0", + "configargparse~=0.10.0", + "pyperclip~=1.5.22", + "blinker~=1.4", + "pyparsing~=2.0.5", + "html2text~=2015.11.4", + "construct~=2.5.2", + "six~=1.10.0", + "lxml~=3.4.4", + "Pillow~=3.0.0", + "watchdog~=0.8.3", +} +# A script -> additional dependencies dict. +scripts = { + "mitmproxy": { + "urwid~=1.3.1", + }, + "mitmdump": { + "click~=6.2", + }, + "mitmweb": set() +} +# Developer dependencies +dev_deps = { + "mock>=1.0.1", + "pytest>=2.8.0", + "pytest-xdist>=1.13.1", + "pytest-cov>=2.1.0", + "coveralls>=0.4.1", + "pathod>=%s, <%s" % (version.MINORVERSION, version.NEXT_MINORVERSION), + "sphinx>=1.3.1", + "sphinx-autobuild>=0.5.2", + "sphinxcontrib-documentedlist>=0.2", +} +example_deps = { + "pytz~=2015.7", + "harparser~=0.2", + "beautifulsoup4~=4.4.1", +} +# Add *all* script dependencies to developer dependencies. +for script_deps in scripts.values(): + dev_deps.update(script_deps) + +# Remove mitmproxy for Windows support. +if os.name == "nt": + del scripts["mitmproxy"] + deps.add("pydivert~=0.0.7") # Transparent proxying on Windows + +# Add dependencies for available scripts as core dependencies. +for script_deps in scripts.values(): + deps.update(script_deps) + +if sys.version_info < (3, 4): + example_deps.add("enum34~=1.0.4") + +console_scripts = ["%s = libmproxy.main:%s" % (s, s) for s in scripts.keys()] setup( name="mitmproxy", @@ -43,54 +103,15 @@ setup( packages=find_packages(), include_package_data=True, entry_points={ - 'console_scripts': console_scripts - }, - install_requires=[ - "netlib>=%s, <%s" % (version.MINORVERSION, version.NEXT_MINORVERSION), - "pyasn1~=0.1.9", - "tornado~=4.3.0", - "configargparse~=0.10.0", - "pyperclip~=1.5.22", - "blinker~=1.4", - "pyparsing~=2.0.5", - "html2text~=2015.11.4", - "construct~=2.5.2", - "six~=1.10.0", - "lxml~=3.4.4", - "Pillow~=3.0.0", - "watchdog~=0.8.3", - "click~=6.2", - ], + 'console_scripts': console_scripts}, + install_requires=list(deps), extras_require={ - ':sys_platform == "win32"': [ - "pydivert~=0.0.7", - ], - ':sys_platform != "win32"': [ - "urwid~=1.3.1", - ], - ':python_version < "3.4"': [ - "enum34~=1.0.4", - ], - 'dev': [ - "mock>=1.0.1", - "pytest>=2.8.0", - "pytest-xdist>=1.13.1", - "pytest-cov>=2.1.0", - "coveralls>=0.4.1", - "pathod>=%s, <%s" % (version.MINORVERSION, version.NEXT_MINORVERSION), - "sphinx>=1.3.1", - "sphinx-autobuild>=0.5.2", - "sphinxcontrib-documentedlist>=0.2", - ], + 'dev': list(dev_deps), 'contentviews': [ "pyamf~=0.7.2", "protobuf~=2.6.1", - "cssutils~=1.0.1", - ], - 'examples': [ - "pytz~=2015.7", - "harparser~=0.2", - "beautifulsoup4~=4.4.1", + "cssutils~=1.0.1" ], + 'examples': list(example_deps) } )