diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-03-18 14:57:16 +0100 | 
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2016-03-18 14:57:16 +0100 | 
| commit | afb24d8c4cae2a0208f1f28e9302641d85cedbd9 (patch) | |
| tree | 0bfbde64f82f9731a0823d85feba87b527021baa | |
| parent | f5a6ebf5842872d9bb05c89ab86a7053ac6a5e8d (diff) | |
| parent | c8ddd8783719b6f7dfe654620a09a090565b1fc7 (diff) | |
| download | mitmproxy-afb24d8c4cae2a0208f1f28e9302641d85cedbd9.tar.gz mitmproxy-afb24d8c4cae2a0208f1f28e9302641d85cedbd9.tar.bz2 mitmproxy-afb24d8c4cae2a0208f1f28e9302641d85cedbd9.zip | |
Merge remote-tracking branch 'origin/requires-io-master'
| -rw-r--r-- | setup.py | 8 | 
1 files changed, 4 insertions, 4 deletions
| @@ -65,7 +65,7 @@ setup(          "certifi>=2015.11.20.1",  # no semver here - this should always be on the last release!          "configargparse>=0.10, <0.11",          "construct>=2.5.2, <2.6", -        "cryptography>=1.2.2, <1.3", +        "cryptography>=1.3,<1.4",          "Flask>=0.10.1, <0.11",          "h2>=2.1.2, <3.0",          "hpack>=2.1.0, <3.0", @@ -85,7 +85,7 @@ setup(      ],      extras_require={          ':sys_platform == "win32"': [ -            "lxml==3.4.4",  # there are no Windows wheels for newer versions, so we pin this. +            "lxml==3.6.0",  # there are no Windows wheels for newer versions, so we pin this.              "pydivert>=0.0.7, <0.1",          ],          ':sys_platform != "win32"': [ @@ -100,7 +100,7 @@ setup(          'dev': [              "coveralls>=1.1, <1.2",              "mock>=1.3.0, <1.4", -            "pytest>=2.8.7, <2.9", +            "pytest>=2.9,<2.10",              "pytest-cov>=2.2.1, <2.3",              "pytest-timeout>=1.0.0, <1.1",              "pytest-xdist>=1.14, <1.15", @@ -116,7 +116,7 @@ setup(          'examples': [              "beautifulsoup4>=4.4.1, <4.5",              "harparser>=0.2, <0.3", -            "pytz==2015.7.0", +            "pytz==2016.1",          ]      }  ) | 
