diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-11-11 12:29:34 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-11-11 12:29:34 +0100 |
| commit | 8635e00175117d8574b4bea5edc1c43528ddf3e9 (patch) | |
| tree | 1be23a6349a8fb81a89f8417b0b9d236d1829639 /setup.py | |
| parent | b917b61e6aead4f353ef15838315ecc0df721e29 (diff) | |
| parent | 27c7e9e9345bbc458e7efc4093c2074e19011d12 (diff) | |
| download | mitmproxy-8635e00175117d8574b4bea5edc1c43528ddf3e9.tar.gz mitmproxy-8635e00175117d8574b4bea5edc1c43528ddf3e9.tar.bz2 mitmproxy-8635e00175117d8574b4bea5edc1c43528ddf3e9.zip | |
Merge remote-tracking branch 'origin/master'
Conflicts:
setup.py
Diffstat (limited to 'setup.py')
| -rw-r--r-- | setup.py | 12 |
1 files changed, 4 insertions, 8 deletions
@@ -35,16 +35,12 @@ setup( packages=find_packages(), include_package_data=True, - - entry_points={ - 'console_scripts': [ - "pathod = libpathod.main:pathod", - "pathoc = libpathod.main:pathoc" - ] - }, - + scripts = ["pathod", "pathoc"], install_requires=[ "netlib>=%s, <%s" % (version.MINORVERSION, version.NEXT_MINORVERSION), + # It's INSANE that we have to do this, but... + # FIXME: Requirement to be removed at next release + "pip>=1.5.6", "requests>=2.4.1", "Flask>=0.10.1" ], |