git.iko.soy/searx
on master help sign in
Merge pull request #2459 from dalf/update-python
f7e11fdAlexandre Flament
.github/workflows/integration.yml+1−1
compare with master
unifiedsplit
@@ -9,7 +9,7 @@ jobs:
9 strategy:
9 strategy:
10 matrix:
10 matrix:
11 os: [ubuntu-latest]
11 os: [ubuntu-latest]
12− python-version: [3.5, 3.6, 3.7, 3.8]
12+ python-version: [3.6, 3.7, 3.8, 3.9]
13 steps:
13 steps:
14 - name: Checkout
14 - name: Checkout
15 uses: actions/checkout@v2
15 uses: actions/checkout@v2
Makefile+1−1
@@ -6,7 +6,7 @@ include utils/makefile.include
6PYOBJECTS = searx
6PYOBJECTS = searx
7DOC = docs
7DOC = docs
8PY_SETUP_EXTRAS ?= \[test\]
8PY_SETUP_EXTRAS ?= \[test\]
9−PYLINT_SEARX_DISABLE_OPTION := I,C,R,W0105,W0212,W0511,W0603,W0613,W0621,W0702,W0703,W1401
9+PYLINT_SEARX_DISABLE_OPTION := I,C,R,W0105,W0212,W0511,W0603,W0613,W0621,W0702,W0703,W1401,E1136
10PYLINT_ADDITIONAL_BUILTINS_FOR_ENGINES := supported_languages,language_aliases
10PYLINT_ADDITIONAL_BUILTINS_FOR_ENGINES := supported_languages,language_aliases
11
11
12include utils/makefile.python
12include utils/makefile.python
requirements-dev.txt+5−10
@@ -1,5 +1,4 @@
1−mock==4.0.3; python_version >= "3.6"
1+mock==4.0.3
2−mock==2.0.0; python_version < "3.6"
3nose2[coverage_plugin]==0.9.2
2nose2[coverage_plugin]==0.9.2
4cov-core==1.15.0
3cov-core==1.15.0
5pycodestyle==2.6.0
4pycodestyle==2.6.0
@@ -8,16 +7,12 @@ splinter==0.14.0
8transifex-client==0.14.2
7transifex-client==0.14.2
9unittest2==1.1.0
8unittest2==1.1.0
10selenium==3.141.0
9selenium==3.141.0
11−twine==3.3.0; python_version >= "3.6"
10+twine==3.3.0
12−twine==1.15.0; python_version < "3.6"
13Pallets-Sphinx-Themes==1.2.3
11Pallets-Sphinx-Themes==1.2.3
14−Sphinx==3.4.1; python_version >= '3.6'
12+Sphinx==3.4.1
15−Sphinx==3.0.1; python_version < '3.6'
16sphinx-issues==1.2.0
13sphinx-issues==1.2.0
17sphinx-jinja==1.1.1
14sphinx-jinja==1.1.1
18−sphinx-tabs==1.3.0; python_version >= '3.6'
15+sphinx-tabs==1.3.0
19−sphinx-tabs==1.1.13; python_version < '3.6'
20sphinxcontrib-programoutput==0.16
16sphinxcontrib-programoutput==0.16
21−sphinx-autobuild==2020.9.1; python_version >= '3.6'
17+sphinx-autobuild==2020.9.1
22−sphinx-autobuild==0.7.1; python_version < '3.6'
23linuxdoc==20210110
18linuxdoc==20210110
requirements.txt−1
@@ -6,7 +6,6 @@ idna==2.10
6jinja2==2.11.2
6jinja2==2.11.2
7lxml==4.6.2
7lxml==4.6.2
8pygments==2.1.3
8pygments==2.1.3
9−pyopenssl==20.0.1
10python-dateutil==2.8.1
9python-dateutil==2.8.1
11pyyaml==5.3.1
10pyyaml==5.3.1
12requests[socks]==2.25.1
11requests[socks]==2.25.1
searx/data/__init__.py+1−2
@@ -8,8 +8,7 @@ data_dir = Path(__file__).parent
8
8
9
9
10def load(filename):
10def load(filename):
11− # add str(...) for Python 3.5
12− with open(str(data_dir / filename), encoding='utf-8') as fd:
11+ with open(data_dir / filename, encoding='utf-8') as fd:
13 return json.load(fd)
12 return json.load(fd)
14
13
15
14