aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Kriechbaumer <thomas@kriechbaumer.name>2016-07-10 13:38:49 +0200
committerThomas Kriechbaumer <thomas@kriechbaumer.name>2016-07-10 13:38:49 +0200
commite89defe9ad4d1660b061d9fdf92b5c325faa2000 (patch)
tree76d908fb081165a958aff17e23854d4a0375b5b2
parent81c450ddc8b803eeb0e9ca0899bd61fde8a8b00f (diff)
downloadmitmproxy-e89defe9ad4d1660b061d9fdf92b5c325faa2000.tar.gz
mitmproxy-e89defe9ad4d1660b061d9fdf92b5c325faa2000.tar.bz2
mitmproxy-e89defe9ad4d1660b061d9fdf92b5c325faa2000.zip
update dependency and loosen restrictions on good citizens
-rw-r--r--setup.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/setup.py b/setup.py
index d1c15734..e0bd4545 100644
--- a/setup.py
+++ b/setup.py
@@ -2,13 +2,13 @@ from setuptools import setup, find_packages
from codecs import open
import os
+from netlib import version
+
# Based on https://github.com/pypa/sampleproject/blob/master/setup.py
# and https://python-packaging-user-guide.readthedocs.org/
here = os.path.abspath(os.path.dirname(__file__))
-from netlib import version
-
with open(os.path.join(here, 'README.rst'), encoding='utf-8') as f:
long_description = f.read()
@@ -72,7 +72,7 @@ setup(
"html2text>=2016.1.8, <=2016.5.29",
"hyperframe>=4.0.1, <5",
"lxml>=3.5.0, <3.7",
- "Pillow>=3.2, <3.3",
+ "Pillow>=3.2, <3.4",
"passlib>=1.6.5, <1.7",
"pyasn1>=0.1.9, <0.2",
"pyOpenSSL>=16.0, <17.0",
@@ -100,10 +100,10 @@ setup(
'dev': [
"tox>=2.3, <3",
"mock>=2.0, <2.1",
- "pytest>=2.8.7, <2.10",
- "pytest-cov>=2.2.1, <2.3",
- "pytest-timeout>=1.0.0, <1.1",
- "pytest-xdist>=1.14, <1.15",
+ "pytest>=2.8.7, <3",
+ "pytest-cov>=2.2.1, <3",
+ "pytest-timeout>=1.0.0, <2",
+ "pytest-xdist>=1.14, <2",
"sphinx>=1.3.5, <1.5",
"sphinx-autobuild>=0.5.2, <0.7",
"sphinxcontrib-documentedlist>=0.4.0, <0.5",