257e529 · searx · git.iko.soy

git.iko.soy/searx

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

WARNING: dependency changes

commit257e52954a407c41b9b758d56fba684903a7c0b4 authorAdam Tauber <asciimoo@gmail.com> dateMon 4 Jul 2016, 22:46 (10 years ago) parentbd48f34

13 files changed+23−23

compare with master

unifiedsplit

.travis.yml+1−2 requirements-dev.txt+3−3 requirements.txt+8−8 searx/engines/__init__.py+1−1 searx/plugins/__init__.py+2−2 searx/plugins/https_rewrite.py+1−1 searx/plugins/open_results_on_new_tab.py+1−1 searx/plugins/search_on_category_select.py+1−1 searx/plugins/self_info.py+1−1 searx/plugins/tracker_url_remover.py+1−1 searx/plugins/vim_hotkeys.py+1−1 searx/webapp.py+1−1 tests/unit/test_webapp.py+1

.travis.yml+1−2

@@ -16,11 +16,10 @@ install:

1616 - ./manage.sh update_dev_packages

1717 - pip install coveralls

1818script:

19− - ./manage.sh pep8_check

2019 - ./manage.sh styles

2120 - ./manage.sh grunt_build

21+ - ./manage.sh tests

2222 - ./manage.sh py_test_coverage

23− - ./manage.sh robot_tests

2423after_success:

2524 coveralls

2625notifications:

requirements-dev.txt+3−3

@@ -1,8 +1,8 @@

1−babel==2.2.0

2−mock==1.0.1

1+babel==2.3.4

2+mock==2.0.0

33nose2[coverage-plugin]

44pep8==1.7.0

5−plone.testing==4.0.15

5+plone.testing==5.0.0

66robotframework-selenium2library==1.7.4

77robotsuite==1.7.0

88transifex-client==0.11

requirements.txt+8−8

@@ -1,12 +1,12 @@

1−certifi==2015.11.20.1

2−flask==0.10.1

3−flask-babel==0.9

4−lxml==3.5.0

5−ndg-httpsclient==0.4.0

1+certifi==2016.2.28

2+flask==0.11.1

3+flask-babel==0.11.1

4+lxml==3.6.0

5+ndg-httpsclient==0.4.1

66pyasn1==0.1.9

77pyasn1-modules==0.0.8

8−pygments==2.0.2

8+pygments==2.1.3

99pyopenssl==0.15.1

10−python-dateutil==2.4.2

10+python-dateutil==2.5.3

1111pyyaml==3.11

12−requests==2.9.1

12+requests==2.10.0

searx/engines/__init__.py+1−1

@@ -19,7 +19,7 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >.

1919from os.path import realpath, dirname, splitext, join

2020import sys

2121from imp import load_source

22−from flask.ext.babel import gettext

22+from flask_babel import gettext

2323from operator import itemgetter

2424from searx import settings

2525from searx import logger

searx/plugins/__init__.py+2−2

@@ -26,8 +26,8 @@ from searx.plugins import (https_rewrite,

2626 tracker_url_remover,

2727 vim_hotkeys)

2828

29−required_attrs = (('name', str),

30− ('description', str),

29+required_attrs = (('name', (str, unicode)),

30+ ('description', (str, unicode)),

3131 ('default_on', bool))

3232

3333optional_attrs = (('js_dependencies', tuple),

searx/plugins/https_rewrite.py+1−1

@@ -21,7 +21,7 @@ from lxml import etree

2121from os import listdir, environ

2222from os.path import isfile, isdir, join

2323from searx.plugins import logger

24−from flask.ext.babel import gettext

24+from flask_babel import gettext

2525from searx import searx_dir

2626

2727

searx/plugins/open_results_on_new_tab.py+1−1

@@ -14,7 +14,7 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >.

1414

1616'''

17−from flask.ext.babel import gettext

17+from flask_babel import gettext

1818name = gettext('Open result links on new browser tabs')

1919description = gettext('Results are opened in the same window by default. '

2020 'This plugin overwrites the default behaviour to open links on new tabs/windows. '

searx/plugins/search_on_category_select.py+1−1

@@ -14,7 +14,7 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >.

1414

1616'''

17−from flask.ext.babel import gettext

17+from flask_babel import gettext

1818name = gettext('Search on category select')

1919description = gettext('Perform search immediately if a category selected. '

2020 'Disable to select multiple categories. (JavaScript required)')

searx/plugins/self_info.py+1−1

@@ -14,7 +14,7 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >.

1414

1616'''

17−from flask.ext.babel import gettext

17+from flask_babel import gettext

1818import re

1919name = "Self Informations"

2020description = gettext('Displays your IP if the query is "ip" and your user agent if the query contains "user agent".')

searx/plugins/tracker_url_remover.py+1−1

@@ -15,7 +15,7 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >.

1616'''

1717

18−from flask.ext.babel import gettext

18+from flask_babel import gettext

1919import re

2020from urlparse import urlunparse

2121

searx/plugins/vim_hotkeys.py+1−1

@@ -1,4 +1,4 @@

1−from flask.ext.babel import gettext

1+from flask_babel import gettext

33name = gettext('Vim-like hotkeys')

44description = gettext('Navigate search results with Vim-like hotkeys '

searx/webapp.py+1−1

@@ -48,7 +48,7 @@ from flask import (

4848 Flask, request, render_template, url_for, Response, make_response,

4949 redirect, send_from_directory

5050)

51−from flask.ext.babel import Babel, gettext, format_date, format_decimal

51+from flask_babel import Babel, gettext, format_date, format_decimal

5252from flask.json import jsonify

5353from searx import settings, searx_dir

5454from searx.engines import (

tests/unit/test_webapp.py+1

@@ -38,6 +38,7 @@ class ViewsTestCase(SearxTestCase):

3838 suggestions=set(),

3939 infoboxes=[],

4040 results=self.test_results,

41+ number_of_results=len(self.test_results),

4142 results_length=lambda: len(self.test_results))

4243

4344 webapp.Search.search = search_mock