Commit 257e5295 authored by Adam Tauber's avatar Adam Tauber

[enh][fix] update to latest dependencies ++ fix tests & travis test runner

WARNING: dependency changes
parent bd48f34d
......@@ -16,11 +16,10 @@ install:
- ./manage.sh update_dev_packages
- pip install coveralls
script:
- ./manage.sh pep8_check
- ./manage.sh styles
- ./manage.sh grunt_build
- ./manage.sh tests
- ./manage.sh py_test_coverage
- ./manage.sh robot_tests
after_success:
coveralls
notifications:
......
babel==2.2.0
mock==1.0.1
babel==2.3.4
mock==2.0.0
nose2[coverage-plugin]
pep8==1.7.0
plone.testing==4.0.15
plone.testing==5.0.0
robotframework-selenium2library==1.7.4
robotsuite==1.7.0
transifex-client==0.11
......
certifi==2015.11.20.1
flask==0.10.1
flask-babel==0.9
lxml==3.5.0
ndg-httpsclient==0.4.0
certifi==2016.2.28
flask==0.11.1
flask-babel==0.11.1
lxml==3.6.0
ndg-httpsclient==0.4.1
pyasn1==0.1.9
pyasn1-modules==0.0.8
pygments==2.0.2
pygments==2.1.3
pyopenssl==0.15.1
python-dateutil==2.4.2
python-dateutil==2.5.3
pyyaml==3.11
requests==2.9.1
requests==2.10.0
......@@ -19,7 +19,7 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >.
from os.path import realpath, dirname, splitext, join
import sys
from imp import load_source
from flask.ext.babel import gettext
from flask_babel import gettext
from operator import itemgetter
from searx import settings
from searx import logger
......
......@@ -26,8 +26,8 @@ from searx.plugins import (https_rewrite,
tracker_url_remover,
vim_hotkeys)
required_attrs = (('name', str),
('description', str),
required_attrs = (('name', (str, unicode)),
('description', (str, unicode)),
('default_on', bool))
optional_attrs = (('js_dependencies', tuple),
......
......@@ -21,7 +21,7 @@ from lxml import etree
from os import listdir, environ
from os.path import isfile, isdir, join
from searx.plugins import logger
from flask.ext.babel import gettext
from flask_babel import gettext
from searx import searx_dir
......
......@@ -14,7 +14,7 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >.
(C) 2016 by Adam Tauber, <asciimoo@gmail.com>
'''
from flask.ext.babel import gettext
from flask_babel import gettext
name = gettext('Open result links on new browser tabs')
description = gettext('Results are opened in the same window by default. '
'This plugin overwrites the default behaviour to open links on new tabs/windows. '
......
......@@ -14,7 +14,7 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >.
(C) 2015 by Adam Tauber, <asciimoo@gmail.com>
'''
from flask.ext.babel import gettext
from flask_babel import gettext
name = gettext('Search on category select')
description = gettext('Perform search immediately if a category selected. '
'Disable to select multiple categories. (JavaScript required)')
......
......@@ -14,7 +14,7 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >.
(C) 2015 by Adam Tauber, <asciimoo@gmail.com>
'''
from flask.ext.babel import gettext
from flask_babel import gettext
import re
name = "Self Informations"
description = gettext('Displays your IP if the query is "ip" and your user agent if the query contains "user agent".')
......
......@@ -15,7 +15,7 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >.
(C) 2015 by Adam Tauber, <asciimoo@gmail.com>
'''
from flask.ext.babel import gettext
from flask_babel import gettext
import re
from urlparse import urlunparse
......
from flask.ext.babel import gettext
from flask_babel import gettext
name = gettext('Vim-like hotkeys')
description = gettext('Navigate search results with Vim-like hotkeys '
......
......@@ -48,7 +48,7 @@ from flask import (
Flask, request, render_template, url_for, Response, make_response,
redirect, send_from_directory
)
from flask.ext.babel import Babel, gettext, format_date, format_decimal
from flask_babel import Babel, gettext, format_date, format_decimal
from flask.json import jsonify
from searx import settings, searx_dir
from searx.engines import (
......
......@@ -38,6 +38,7 @@ class ViewsTestCase(SearxTestCase):
suggestions=set(),
infoboxes=[],
results=self.test_results,
number_of_results=len(self.test_results),
results_length=lambda: len(self.test_results))
webapp.Search.search = search_mock
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment