git.iko.soy/searx
on master help sign in
Merge pull request #2459 from dalf/update-python

Update python

commitf7e11fd7222363a72a8fa33cf69190f64a3880bd authorAlexandre Flament <alex@al-f.net> dateTue 12 Jan 2021, 11:02 (6 years ago) parent9c55d778989bc7
5 files changed+8−15
compare with master
unifiedsplit
.github/workflows/integration.yml+1−1 Makefile+1−1 requirements-dev.txt+5−10 requirements.txt−1 searx/data/__init__.py+1−2
.github/workflows/integration.yml+1−1
@@ -9,7 +9,7 @@ jobs:
99 strategy:
1010 matrix:
1111 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]
1313 steps:
1414 - name: Checkout
1515 uses: actions/checkout@v2
Makefile+1−1
@@ -6,7 +6,7 @@ include utils/makefile.include
66PYOBJECTS = searx
77DOC = docs
88PY_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
1010PYLINT_ADDITIONAL_BUILTINS_FOR_ENGINES := supported_languages,language_aliases
1111
1212include utils/makefile.python
requirements-dev.txt+5−10
@@ -1,5 +1,4 @@
1−mock==4.0.3; python_version >= "3.6"
2−mock==2.0.0; python_version < "3.6"
1+mock==4.0.3
32nose2[coverage_plugin]==0.9.2
43cov-core==1.15.0
54pycodestyle==2.6.0
@@ -8,16 +7,12 @@ splinter==0.14.0
87transifex-client==0.14.2
98unittest2==1.1.0
109selenium==3.141.0
11−twine==3.3.0; python_version >= "3.6"
12−twine==1.15.0; python_version < "3.6"
10+twine==3.3.0
1311Pallets-Sphinx-Themes==1.2.3
14−Sphinx==3.4.1; python_version >= '3.6'
15−Sphinx==3.0.1; python_version < '3.6'
12+Sphinx==3.4.1
1613sphinx-issues==1.2.0
1714sphinx-jinja==1.1.1
18−sphinx-tabs==1.3.0; python_version >= '3.6'
19−sphinx-tabs==1.1.13; python_version < '3.6'
15+sphinx-tabs==1.3.0
2016sphinxcontrib-programoutput==0.16
21−sphinx-autobuild==2020.9.1; python_version >= '3.6'
22−sphinx-autobuild==0.7.1; python_version < '3.6'
17+sphinx-autobuild==2020.9.1
2318linuxdoc==20210110
requirements.txt−1
@@ -6,7 +6,6 @@ idna==2.10
66jinja2==2.11.2
77lxml==4.6.2
88pygments==2.1.3
9−pyopenssl==20.0.1
109python-dateutil==2.8.1
1110pyyaml==5.3.1
1211requests[socks]==2.25.1
searx/data/__init__.py+1−2
@@ -8,8 +8,7 @@ data_dir = Path(__file__).parent
88
99
1010def 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:
1312 return json.load(fd)
1413
1514