Skip to content

Commit

Permalink
Merge pull request #3850 from camptocamp/requires-io-master
Browse files Browse the repository at this point in the history
[requires.io] dependency update on master branch
  • Loading branch information
sbrunner committed Jun 25, 2018
2 parents 7492089 + 5de4fe8 commit 1953fcb
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 12 deletions.
12 changes: 6 additions & 6 deletions docker/build/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
alabaster==0.7.11 # Doc theme
alembic==0.9.9 # geoportal
Babel==2.6.0 # i18n
boto3==1.7.42 # Tile generation
boto3==1.7.45 # Tile generation
bottle==0.12.13 # geoportal
c2c.cssmin==0.7.dev6 # CGXP build
c2c.template==2.1.0.dev1 # geoportal
c2cgeoform==2.0.dev20180619 # commons
c2cgeoform==2.0.dev20180624 # commons
codacy-coverage==1.3.11 # Codacy send report
codespell==1.13.0 # Lint
colander==1.4 # commons, admin
Expand Down Expand Up @@ -42,7 +42,7 @@ pep8-naming==0.7.0 # Lint
Pillow==5.1.0 # Tile generation
polib==1.1.0 # i18n
psycopg2-binary==2.7.5 # geoportal
pycryptodome==3.6.2 # geoportal
pycryptodome==3.6.3 # geoportal
pyflakes==1.6.0 # lint, flake8 requires < 1.7.0, rq.filter: <1.7.0
Pygments==2.2.0 # doc
pylint==1.9.2 # lint
Expand All @@ -56,7 +56,7 @@ pytest-cov==2.5.1 # tests
pytest-selenium==1.13.0 # admin tests
python-dateutil==2.6.1 # geoportal, rq.filter: <2.7.0
PyYAML==3.12 # geoportal
rasterio==1.0b2 # geoportal raster
rasterio==1.0b4 # geoportal raster
requests==2.19.1 # geoportal
redis==2.10.6 # geoportal cache
Shapely==1.6.4.post1 # geoportal
Expand All @@ -71,8 +71,8 @@ transifex-client==0.12.5 # Makefile, rq.filter: <=0.12.5
translationstring==1.3 # admin
virtualenv==16.0.0 # Makefile
waitress==1.1.0 # pcreate
WebOb==1.7.4 # geoportal test
WebTest==2.0.29 # admin tests
WebOb==1.8.2 # geoportal test
WebTest==2.0.30 # admin tests
wsgi_lineprof==0.4.0 # profiling
yamllint==1.11.1 # lint
zgitignore==0.8.0 # Makefile
Expand Down
4 changes: 2 additions & 2 deletions geoportal/tests/functional/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

import os
from configparser import ConfigParser
from webob.acceptparse import Accept
import webob.acceptparse

from pyramid import testing

Expand Down Expand Up @@ -168,7 +168,7 @@ def create_dummy_request(additional_settings=None, authentication=True, user=Non
"geometry_validation": True
}
}, *args, **kargs)
request.accept_language = Accept("fr-CH,fr;q=0.8,en;q=0.5,en-US;q=0.3")
request.accept_language = webob.acceptparse.create_accept_language_header("fr-CH,fr;q=0.8,en;q=0.5,en-US;q=0.3")
request.registry.settings.update(additional_settings)
request.referer = "http://example.com/app"
request.path_info_peek = lambda: "main"
Expand Down
7 changes: 3 additions & 4 deletions geoportal/tests/functional/test_fulltextsearch.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@

from pyramid import testing
from pyramid.response import Response
import webob.acceptparse

from tests.functional import ( # noqa
teardown_common as teardown_module,
Expand Down Expand Up @@ -181,11 +182,10 @@ def _create_dummy_request(username=None, params=None):
def test_no_default_laguage(self):
from pyramid.httpexceptions import HTTPInternalServerError
from c2cgeoportal_geoportal.views.fulltextsearch import FullTextSearchView
from webob.acceptparse import Accept

request = self._create_dummy_request()
del(request.registry.settings["default_locale_name"])
request.accept_language = Accept("es")
request.accept_language = webob.acceptparse.create_accept_language_header("es")

fts = FullTextSearchView(request)
response = fts.fulltextsearch()
Expand All @@ -194,11 +194,10 @@ def test_no_default_laguage(self):
def test_unknown_laguage(self):
from pyramid.httpexceptions import HTTPInternalServerError
from c2cgeoportal_geoportal.views.fulltextsearch import FullTextSearchView
from webob.acceptparse import Accept

request = self._create_dummy_request()
request.registry.settings["default_locale_name"] = "it"
request.accept_language = Accept("es")
request.accept_language = webob.acceptparse.create_accept_language_header("es")
fts = FullTextSearchView(request)
response = fts.fulltextsearch()
self.assertTrue(isinstance(response, HTTPInternalServerError))
Expand Down

0 comments on commit 1953fcb

Please sign in to comment.