diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2014-11-15 12:42:38 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2014-11-15 12:42:38 +1300 |
| commit | 63d2403558704add84f67cfdf85603760c597cdc (patch) | |
| tree | 96b6de8a56d2f2752ffb4e413fe27d5994744f32 | |
| parent | 1b41b9bb9b12a4ac3ce56f6c3abe3bbbf4e7bfa4 (diff) | |
| parent | 8635e00175117d8574b4bea5edc1c43528ddf3e9 (diff) | |
| download | mitmproxy-63d2403558704add84f67cfdf85603760c597cdc.tar.gz mitmproxy-63d2403558704add84f67cfdf85603760c597cdc.tar.bz2 mitmproxy-63d2403558704add84f67cfdf85603760c597cdc.zip | |
Merge branch 'master' of ssh.github.com:mitmproxy/pathod
| -rw-r--r-- | libpathod/version.py | 6 | ||||
| -rw-r--r-- | setup.py | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libpathod/version.py b/libpathod/version.py index ad539392..7022c843 100644 --- a/libpathod/version.py +++ b/libpathod/version.py @@ -2,4 +2,8 @@ IVERSION = (0, 11) VERSION = ".".join(str(i) for i in IVERSION) MINORVERSION = ".".join(str(i) for i in IVERSION[:2]) NAME = "pathod" -NAMEVERSION = NAME + " " + VERSION
\ No newline at end of file +NAMEVERSION = NAME + " " + VERSION + +NEXT_MINORVERSION = list(IVERSION) +NEXT_MINORVERSION[1] += 1 +NEXT_MINORVERSION = ".".join(str(i) for i in NEXT_MINORVERSION[:2])
\ No newline at end of file @@ -37,7 +37,7 @@ setup( include_package_data=True, scripts = ["pathod", "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", |