# HG changeset patch # User Mads Kiilerich # Date 2017-02-02 03:11:47 # Node ID 1f43d08ce5a876fc65a8fb48c623b73575032a8e # Parent 5cf18f89ab3e802720ad71739a2ac5b3bc5c2d39 setup: bump WebOb to >=1.7 TurboGears will soon require WebOb>=1.7 and that cause an innocent test change. Older WebOb versions also required older WebTest versions but the WebTest dependency from Pylons will now automatically pick compatible versions. diff --git a/dev_requirements.txt b/dev_requirements.txt --- a/dev_requirements.txt +++ b/dev_requirements.txt @@ -2,6 +2,5 @@ pytest ~= 3.0 pytest-runner pytest-sugar>=0.7.0 pytest-catchlog -WebTest<2 # this is also a Pylons dependency and pinned in setup.py to avoid version conflicts for WebOb mock sphinx diff --git a/kallithea/tests/functional/test_files.py b/kallithea/tests/functional/test_files.py --- a/kallithea/tests/functional/test_files.py +++ b/kallithea/tests/functional/test_files.py @@ -207,7 +207,7 @@ class TestFilesController(TestController ('Pragma', 'no-cache'), ('Cache-Control', 'no-cache'), ('Content-Disposition', 'attachment; filename=%s' % filename), - ('Content-Type', '%s; charset=utf-8' % info[0]), + ('Content-Type', info[0]), ] assert response.response._headers.items() == heads diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -37,9 +37,8 @@ is_windows = __platform__ in ['Windows'] requirements = [ "alembic>=0.8.0,<0.9", "waitress>=0.8.8,<1.0", - "webob>=1.0.8,<=1.1.1", + "webob>=1.7,<2", "Pylons>=1.0.0,<=1.0.2", - "WebTest<2.0", # make the Pylons dependency pick a version that supports our WebOb version "Beaker>=1.7.0,<2", "WebHelpers==1.3", "formencode>=1.2.4,<=1.2.6",