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

WARNING: dependency changes
This commit is contained in:
Adam Tauber 2016-07-04 22:46:43 +02:00
parent bd48f34dbd
commit 257e52954a
13 changed files with 23 additions and 23 deletions

View file

@ -16,11 +16,10 @@ install:
- ./manage.sh update_dev_packages - ./manage.sh update_dev_packages
- pip install coveralls - pip install coveralls
script: script:
- ./manage.sh pep8_check
- ./manage.sh styles - ./manage.sh styles
- ./manage.sh grunt_build - ./manage.sh grunt_build
- ./manage.sh tests
- ./manage.sh py_test_coverage - ./manage.sh py_test_coverage
- ./manage.sh robot_tests
after_success: after_success:
coveralls coveralls
notifications: notifications:

View file

@ -1,8 +1,8 @@
babel==2.2.0 babel==2.3.4
mock==1.0.1 mock==2.0.0
nose2[coverage-plugin] nose2[coverage-plugin]
pep8==1.7.0 pep8==1.7.0
plone.testing==4.0.15 plone.testing==5.0.0
robotframework-selenium2library==1.7.4 robotframework-selenium2library==1.7.4
robotsuite==1.7.0 robotsuite==1.7.0
transifex-client==0.11 transifex-client==0.11

View file

@ -1,12 +1,12 @@
certifi==2015.11.20.1 certifi==2016.2.28
flask==0.10.1 flask==0.11.1
flask-babel==0.9 flask-babel==0.11.1
lxml==3.5.0 lxml==3.6.0
ndg-httpsclient==0.4.0 ndg-httpsclient==0.4.1
pyasn1==0.1.9 pyasn1==0.1.9
pyasn1-modules==0.0.8 pyasn1-modules==0.0.8
pygments==2.0.2 pygments==2.1.3
pyopenssl==0.15.1 pyopenssl==0.15.1
python-dateutil==2.4.2 python-dateutil==2.5.3
pyyaml==3.11 pyyaml==3.11
requests==2.9.1 requests==2.10.0

View file

@ -19,7 +19,7 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >.
from os.path import realpath, dirname, splitext, join from os.path import realpath, dirname, splitext, join
import sys import sys
from imp import load_source from imp import load_source
from flask.ext.babel import gettext from flask_babel import gettext
from operator import itemgetter from operator import itemgetter
from searx import settings from searx import settings
from searx import logger from searx import logger

View file

@ -26,8 +26,8 @@ from searx.plugins import (https_rewrite,
tracker_url_remover, tracker_url_remover,
vim_hotkeys) vim_hotkeys)
required_attrs = (('name', str), required_attrs = (('name', (str, unicode)),
('description', str), ('description', (str, unicode)),
('default_on', bool)) ('default_on', bool))
optional_attrs = (('js_dependencies', tuple), optional_attrs = (('js_dependencies', tuple),

View file

@ -21,7 +21,7 @@ from lxml import etree
from os import listdir, environ from os import listdir, environ
from os.path import isfile, isdir, join from os.path import isfile, isdir, join
from searx.plugins import logger from searx.plugins import logger
from flask.ext.babel import gettext from flask_babel import gettext
from searx import searx_dir from searx import searx_dir

View file

@ -14,7 +14,7 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >.
(C) 2016 by Adam Tauber, <asciimoo@gmail.com> (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') name = gettext('Open result links on new browser tabs')
description = gettext('Results are opened in the same window by default. ' description = gettext('Results are opened in the same window by default. '
'This plugin overwrites the default behaviour to open links on new tabs/windows. ' 'This plugin overwrites the default behaviour to open links on new tabs/windows. '

View file

@ -14,7 +14,7 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >.
(C) 2015 by Adam Tauber, <asciimoo@gmail.com> (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') name = gettext('Search on category select')
description = gettext('Perform search immediately if a category selected. ' description = gettext('Perform search immediately if a category selected. '
'Disable to select multiple categories. (JavaScript required)') 'Disable to select multiple categories. (JavaScript required)')

View file

@ -14,7 +14,7 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >.
(C) 2015 by Adam Tauber, <asciimoo@gmail.com> (C) 2015 by Adam Tauber, <asciimoo@gmail.com>
''' '''
from flask.ext.babel import gettext from flask_babel import gettext
import re import re
name = "Self Informations" name = "Self Informations"
description = gettext('Displays your IP if the query is "ip" and your user agent if the query contains "user agent".') description = gettext('Displays your IP if the query is "ip" and your user agent if the query contains "user agent".')

View file

@ -15,7 +15,7 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >.
(C) 2015 by Adam Tauber, <asciimoo@gmail.com> (C) 2015 by Adam Tauber, <asciimoo@gmail.com>
''' '''
from flask.ext.babel import gettext from flask_babel import gettext
import re import re
from urlparse import urlunparse from urlparse import urlunparse

View file

@ -1,4 +1,4 @@
from flask.ext.babel import gettext from flask_babel import gettext
name = gettext('Vim-like hotkeys') name = gettext('Vim-like hotkeys')
description = gettext('Navigate search results with Vim-like hotkeys ' description = gettext('Navigate search results with Vim-like hotkeys '

View file

@ -48,7 +48,7 @@ from flask import (
Flask, request, render_template, url_for, Response, make_response, Flask, request, render_template, url_for, Response, make_response,
redirect, send_from_directory 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 flask.json import jsonify
from searx import settings, searx_dir from searx import settings, searx_dir
from searx.engines import ( from searx.engines import (

View file

@ -38,6 +38,7 @@ class ViewsTestCase(SearxTestCase):
suggestions=set(), suggestions=set(),
infoboxes=[], infoboxes=[],
results=self.test_results, results=self.test_results,
number_of_results=len(self.test_results),
results_length=lambda: len(self.test_results)) results_length=lambda: len(self.test_results))
webapp.Search.search = search_mock webapp.Search.search = search_mock