diff options
author | Aldo Cortesi <aldo@nullcube.com> | 2015-03-14 11:21:32 +1100 |
---|---|---|
committer | Aldo Cortesi <aldo@nullcube.com> | 2015-03-14 11:21:32 +1100 |
commit | 2e64d44aabc41ee93c0a682ce35b34a8716d3b8d (patch) | |
tree | 62ce244987b715d9e9261bea86bd0e8a6c69a77f /setup.py | |
parent | 7caf0e4dce604ef7d76a8cff1e49d0414306dfb3 (diff) | |
parent | 295c8340a39f48652f77d74f3f65bfcec19a5c34 (diff) | |
download | mitmproxy-2e64d44aabc41ee93c0a682ce35b34a8716d3b8d.tar.gz mitmproxy-2e64d44aabc41ee93c0a682ce35b34a8716d3b8d.tar.bz2 mitmproxy-2e64d44aabc41ee93c0a682ce35b34a8716d3b8d.zip |
Merge branch 'master' of ssh.github.com:mitmproxy/pathod
Diffstat (limited to 'setup.py')
-rw-r--r-- | setup.py | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -35,16 +35,17 @@ setup( packages=find_packages(), include_package_data=True, - entry_points={ 'console_scripts': [ "pathod = libpathod.cmdline:go_pathod", "pathoc = libpathod.cmdline:go_pathoc" ] }, - install_requires=[ - 'netlib>=%s' % version.MINORVERSION, + "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" ], |