aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2016-02-16 12:04:25 +1300
committerAldo Cortesi <aldo@nullcube.com>2016-02-16 12:04:25 +1300
commitd17ae31452542484c9ba8ccb705ce3cf141696d6 (patch)
treeeb961171f1f067eef7c593a7bbd3b82f1651ae10
parentf864266ccc93529d9c179c427db2d4f9d2c4a2e6 (diff)
downloadmitmproxy-d17ae31452542484c9ba8ccb705ce3cf141696d6.tar.gz
mitmproxy-d17ae31452542484c9ba8ccb705ce3cf141696d6.tar.bz2
mitmproxy-d17ae31452542484c9ba8ccb705ce3cf141696d6.zip
Satisfy pip constraints, set +x on executables
-rwxr-xr-x[-rw-r--r--]dev.sh0
-rwxr-xr-x[-rw-r--r--]mitmproxy/mitmproxy0
-rwxr-xr-x[-rw-r--r--]mitmproxy/mitmweb0
-rw-r--r--mitmproxy/setup.py2
4 files changed, 1 insertions, 1 deletions
diff --git a/dev.sh b/dev.sh
index dfb31a55..dfb31a55 100644..100755
--- a/dev.sh
+++ b/dev.sh
diff --git a/mitmproxy/mitmproxy b/mitmproxy/mitmproxy
index b7c5c94e..b7c5c94e 100644..100755
--- a/mitmproxy/mitmproxy
+++ b/mitmproxy/mitmproxy
diff --git a/mitmproxy/mitmweb b/mitmproxy/mitmweb
index d709811b..d709811b 100644..100755
--- a/mitmproxy/mitmweb
+++ b/mitmproxy/mitmweb
diff --git a/mitmproxy/setup.py b/mitmproxy/setup.py
index 5bce0c5a..726d927b 100644
--- a/mitmproxy/setup.py
+++ b/mitmproxy/setup.py
@@ -79,7 +79,7 @@ setup(
# Do not use a range operator here: https://bitbucket.org/pypa/setuptools/issues/380
# Ubuntu Trusty and other still ship with setuptools < 17.1
':python_version == "2.7"': [
- "enum34>=1.0.4, <1.2",
+ "enum34>=1.0.4, <1.1",
],
'dev': [
"mock>=1.3.0, <1.4",