Merge branch 'master' of ssh.github.com:mitmproxy/pathod

This commit is contained in:
Aldo Cortesi 2014-11-15 12:42:38 +13:00
commit 63d2403558
2 changed files with 6 additions and 2 deletions

View File

@ -2,4 +2,8 @@ IVERSION = (0, 11)
VERSION = ".".join(str(i) for i in IVERSION) VERSION = ".".join(str(i) for i in IVERSION)
MINORVERSION = ".".join(str(i) for i in IVERSION[:2]) MINORVERSION = ".".join(str(i) for i in IVERSION[:2])
NAME = "pathod" NAME = "pathod"
NAMEVERSION = NAME + " " + VERSION NAMEVERSION = NAME + " " + VERSION
NEXT_MINORVERSION = list(IVERSION)
NEXT_MINORVERSION[1] += 1
NEXT_MINORVERSION = ".".join(str(i) for i in NEXT_MINORVERSION[:2])

View File

@ -37,7 +37,7 @@ setup(
include_package_data=True, include_package_data=True,
scripts = ["pathod", "pathoc"], scripts = ["pathod", "pathoc"],
install_requires=[ install_requires=[
'netlib>=%s' % version.MINORVERSION, "netlib>=%s, <%s" % (version.MINORVERSION, version.NEXT_MINORVERSION),
# It's INSANE that we have to do this, but... # It's INSANE that we have to do this, but...
# FIXME: Requirement to be removed at next release # FIXME: Requirement to be removed at next release
"pip>=1.5.6", "pip>=1.5.6",