aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-11-11 12:30:51 +0100
committerMaximilian Hils <git@maximilianhils.com>2014-11-11 12:30:51 +0100
commitf19ee74b99d0049f4789673e202cfc3fda59bb04 (patch)
tree1735dfcf2e40a150f825932d8eac2b103b0d9215
parent6f3b4eee3c3e30b391be457e38fb5ac67f8ef682 (diff)
downloadmitmproxy-f19ee74b99d0049f4789673e202cfc3fda59bb04.tar.gz
mitmproxy-f19ee74b99d0049f4789673e202cfc3fda59bb04.tar.bz2
mitmproxy-f19ee74b99d0049f4789673e202cfc3fda59bb04.zip
be more explicit about requirements
-rw-r--r--libmproxy/version.py4
-rw-r--r--setup.py4
2 files changed, 6 insertions, 2 deletions
diff --git a/libmproxy/version.py b/libmproxy/version.py
index 3483625d..f4c0cd94 100644
--- a/libmproxy/version.py
+++ b/libmproxy/version.py
@@ -3,3 +3,7 @@ VERSION = ".".join(str(i) for i in IVERSION)
MINORVERSION = ".".join(str(i) for i in IVERSION[:2])
NAME = "mitmproxy"
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
diff --git a/setup.py b/setup.py
index ead61118..149e544a 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@ if os.name != "nt":
scripts.append("mitmproxy")
deps = {
- "netlib>=%s" % version.MINORVERSION,
+ "netlib>=%s, <%s" % (version.MINORVERSION, version.NEXT_MINORVERSION),
"pyasn1>0.1.2",
"pyOpenSSL>=0.14",
"Flask>=0.10.1",
@@ -81,7 +81,7 @@ setup(
"nose>=1.3.0",
"nose-cov>=1.6",
"coveralls>=0.4.1",
- "pathod>=%s" % version.MINORVERSION
+ "pathod>=%s, <%s" % (version.MINORVERSION, version.NEXT_MINORVERSION)
],
'contentviews': [
"pyamf>=0.6.1",