Mercurial > kallithea

changeset 6484:1f43d08ce5a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Mads Kiilerich <mads@kiilerich.com>
date Thu, 02 Feb 2017 03:11:47 +0100
parents 5cf18f89ab3e
children 9c01335db346
files dev_requirements.txt kallithea/tests/functional/test_files.py setup.py
diffstat 3 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/dev_requirements.txt	Thu Feb 02 03:11:29 2017 +0100
+++ b/dev_requirements.txt	Thu Feb 02 03:11:47 2017 +0100
@@ -2,6 +2,5 @@
 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
--- a/kallithea/tests/functional/test_files.py	Thu Feb 02 03:11:29 2017 +0100
+++ b/kallithea/tests/functional/test_files.py	Thu Feb 02 03:11:47 2017 +0100
@@ -207,7 +207,7 @@
                 ('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
 
--- a/setup.py	Thu Feb 02 03:11:29 2017 +0100
+++ b/setup.py	Thu Feb 02 03:11:47 2017 +0100
@@ -37,9 +37,8 @@
 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",