Merge remote-tracking branch 'upstream/master' (6036f6ad) · Commits · e / infra / spot

.codecov.yml

deleted100644 → 0

+0 −31

Original line number	Original line	Diff line number	Diff line
	comment: false
	coverage:
	status:
	project:
	default:
	# basic
	target: auto
	threshold: null
	base: auto
	# advanced
	branches: null
	if_no_uploads: error
	if_not_found: success
	if_ci_failed: error
	only_pulls: false
	flags: null
	paths: null
	patch:
	default:
	# basic
	target: auto
	threshold: null
	base: auto
	# advanced
	branches: null
	if_no_uploads: error
	if_not_found: success
	if_ci_failed: error
	only_pulls: false
	flags: null
	paths: null

.config.sh

deleted100644 → 0

+0 −59

Original line number	Original line	Diff line number	Diff line
	# -- coding: utf-8; mode: sh --
	# SPDX-License-Identifier: AGPL-3.0-or-later
	# shellcheck shell=bash disable=SC2034
	#
	# This environment is used by ./utils scripts like filtron.sh or searx.sh. The
	# default values are most flexible and best maintained, you normally not
	# need to change the defaults (except PUBLIC_URL).
	#
	# Before you change any value here you have to uninstall any previous
	# installation. Further is it recommended to backup your changes simply by
	# adding them to you local brand (git branch)::
	#
	# git add .config

	# The public URL of the searx instance: PUBLIC_URL="https://mydomain.xy/searx"
	# The default is taken from ./utils/brand.env.

	PUBLIC_URL="${SEARX_URL}"

	if [[ ${PUBLIC_URL} == "https://searx.me" ]]; then
	# hint: Linux containers do not have DNS entries, lets use IPs
	PUBLIC_URL="http://$(primary_ip)/searx"
	fi

	# searx.sh
	# ---------

	# SEARX_INTERNAL_URL="127.0.0.1:8888"
	# SEARX_SETTINGS_TEMPLATE="${REPO_ROOT}/utils/templates/etc/searx/use_default_settings.yml"

	# Only change, if you maintain a searx brand in your searx fork (GIT_URL) which
	# is not hold by branch 'master'. The branch has to be a local branch, in the
	# repository from which you install (which is most often the case). If you want
	# to install branch 'foo', don't forget to run 'git branch foo origin/foo' once.
	# GIT_BRANCH="${GIT_BRANCH:-master}"

	# filtron.sh
	# ----------

	# FILTRON_API="127.0.0.1:4005"
	# FILTRON_LISTEN="127.0.0.1:4004"
	# FILTRON_TARGET="127.0.0.1:8888"

	# morty.sh
	# --------

	# morty listen address
	# MORTY_LISTEN="127.0.0.1:3000"
	# PUBLIC_URL_PATH_MORTY="/morty/"

	# system services
	# ---------------

	# Common $HOME folder of the service accounts
	# SERVICE_HOME_BASE="/usr/local"

	# experimental: Set SERVICE_USER to run all services by one account, but be
	# aware that removing discrete components might conflict!
	# SERVICE_USER=searx

.dir-locals.el

+131 −100

Original line number	Original line	Diff line number	Diff line
	;;; .dir-locals.el		;;; .dir-locals.el
	;;		;;
	;; If you get ``* EPC Error *`` (even after a jedi:install-server) in your		;; Per-Directory Local Variables:
	;; emacs session, mostly you have jedi-mode enabled but the python enviroment is		;; https://www.gnu.org/software/emacs/manual/html_node/emacs/Directory-Variables.html
	;; missed. The python environment has to be next to the		;;
			;; .. hint::
			;;
			;; If you get ``* EPC Error *`` (even after a jedi:install-server) in
			;; your emacs session, mostly you have jedi-mode enabled but the python
			;; environment is missed. The python environment has to be next to the
	;; ``<repo>/.dir-locals.el`` in::		;; ``<repo>/.dir-locals.el`` in::
	;;		;;
	;; ./local/py3		;; ./local/py3
	;;		;;
	;; In Emacs, some buffer locals are referencing the project environment:		;; To setup such an environment, build target::
			;;
			;; $ make pyenv.install
			;;
			;; Some buffer locals are referencing the project environment:
	;;		;;
	;; - prj-root --> <repo>/		;; - prj-root --> <repo>/
			;; - nvm-dir --> <repo>/.nvm
	;; - python-environment-directory --> <repo>/local		;; - python-environment-directory --> <repo>/local
	;; - python-environment-default-root-name --> py3		;; - python-environment-default-root-name --> py3
	;; - python-shell-virtualenv-root --> <repo>/local/py3		;; - python-shell-virtualenv-root --> <repo>/local/py3
	@@ -17,22 +27,16 @@
	;; `process-environment' and `exec-path' get proper values in order to run		;; `process-environment' and `exec-path' get proper values in order to run
	;; shells inside the specified virtualenv, example::		;; shells inside the specified virtualenv, example::
	;; (setq python-shell-virtualenv-root "/path/to/env/")		;; (setq python-shell-virtualenv-root "/path/to/env/")
			;; - python-shell-interpreter --> <repo>/local/py3/bin/python
	;;		;;
	;; To setup such an environment build target 'pyenv' or 'pyenvinstall'::		;; Jedi, flycheck & other python stuff should use the 'python-shell-interpreter'
	;;		;; from the local py3 environment.
	;; $ make pyenvinstall
	;;		;;
	;; Alternatively create the virtualenv, source it and install jedi + epc		;; For pyright support you need to install::
	;; (required by `emacs-jedi <https://tkf.github.io/emacs-jedi>`_)::
	;;		;;
	;; $ python -m venv ./local/py3		;; M-x package-install lsp-pyright
	;; ...
	;; $ source ./local/py3/bin/activate
	;; (py3)$ # now install into the activated 'py3' environment ..
	;; (py3)$ pip install jedi epc
	;; ...
	;;		;;
	;; Here is what also I found useful to add to my .emacs::		;; Other useful jedi stuff you might add to your ~/.emacs::
	;;		;;
	;; (global-set-key [f6] 'flycheck-mode)		;; (global-set-key [f6] 'flycheck-mode)
	;; (add-hook 'python-mode-hook 'my:python-mode-hook)		;; (add-hook 'python-mode-hook 'my:python-mode-hook)
	@@ -45,72 +49,102 @@
	;; (define-key python-mode-map (kbd "M-.") 'jedi:goto-definition)		;; (define-key python-mode-map (kbd "M-.") 'jedi:goto-definition)
	;; (define-key python-mode-map (kbd "M-,") 'jedi:goto-definition-pop-marker)		;; (define-key python-mode-map (kbd "M-,") 'jedi:goto-definition-pop-marker)
	;; )		;; )
	;;

	((nil		((nil
	. ((fill-column . 80)		. ((fill-column . 80)
	))		(indent-tabs-mode . nil)
	(python-mode		(eval . (progn
	. ((indent-tabs-mode . nil)
			(add-to-list 'auto-mode-alist '("\\.html\\'" . jinja2-mode))

	;; project root folder is where the `.dir-locals.el' is located		;; project root folder is where the `.dir-locals.el' is located
	(eval . (setq-local		(setq-local prj-root
	prj-root (locate-dominating-file default-directory ".dir-locals.el")))		(locate-dominating-file default-directory ".dir-locals.el"))

			(setq-local python-environment-directory
			(expand-file-name "./local" prj-root))

			;; to get in use of NVM environment, install https://github.com/rejeep/nvm.el
			(setq-local nvm-dir (expand-file-name "./.nvm" prj-root))

	(eval . (setq-local		;; use 'py3' environment as default
	python-environment-directory (expand-file-name "./local" prj-root)))		(setq-local python-environment-default-root-name
			"py3")

	;; use 'py3' enviroment as default		(setq-local python-shell-virtualenv-root
	(eval . (setq-local		(expand-file-name
	python-environment-default-root-name "py3"))		python-environment-default-root-name python-environment-directory))

	(eval . (setq-local		(setq-local python-shell-interpreter
	python-shell-virtualenv-root		(expand-file-name
	(concat python-environment-directory		"bin/python" python-shell-virtualenv-root))))))
	"/"		(makefile-gmake-mode
	python-environment-default-root-name)))		. ((indent-tabs-mode . t)))

	;; python-shell-virtualenv-path is obsolete, use python-shell-virtualenv-root!		(yaml-mode
	;; (eval . (setq-local		. ((eval . (progn
	;; python-shell-virtualenv-path python-shell-virtualenv-root))

	(eval . (setq-local		;; flycheck should use the local py3 environment
	python-shell-interpreter		(setq-local flycheck-yaml-yamllint-executable
	(expand-file-name "bin/python" python-shell-virtualenv-root)))		(expand-file-name "bin/yamllint" python-shell-virtualenv-root))

	(eval . (setq-local		(setq-local flycheck-yamllintrc
	python-environment-virtualenv		(expand-file-name ".yamllint.yml" prj-root))

			(flycheck-checker . yaml-yamllint)))))

			(json-mode
			. ((eval . (progn
			(setq-local js-indent-level 4)
			(flycheck-checker . json-python-json)))))

			(js-mode
			. ((eval . (progn
			;; use nodejs from the (local) NVM environment (see nvm-dir)
			(nvm-use-for-buffer)
			(setq-local js-indent-level 2)
			;; flycheck should use the eslint checker from developer tools
			(setq-local flycheck-javascript-eslint-executable
			(expand-file-name "node_modules/.bin/eslint" prj-root))

			(flycheck-mode)
			))))

			(python-mode
			. ((eval . (progn
			;; use nodejs from the (local) NVM environment (see nvm-dir)
			(nvm-use-for-buffer)
			(if (featurep 'lsp-pyright)
			(lsp))
			(setq-local python-environment-virtualenv
	(list (expand-file-name "bin/virtualenv" python-shell-virtualenv-root)		(list (expand-file-name "bin/virtualenv" python-shell-virtualenv-root)
	;;"--system-site-packages"		;;"--system-site-packages"
	"--quiet")))		"--quiet"))

	(eval . (setq-local		(setq-local pylint-command
	pylint-command		(expand-file-name "bin/pylint" python-shell-virtualenv-root))
	(expand-file-name "bin/pylint" python-shell-virtualenv-root)))

	;; pylint will find the '.pylintrc' file next to the CWD		;; pylint will find the '.pylintrc' file next to the CWD
	;; https://pylint.readthedocs.io/en/latest/user_guide/run.html#command-line-options		;; https://pylint.readthedocs.io/en/latest/user_guide/run.html#command-line-options
	(eval . (setq-local		(setq-local flycheck-pylintrc
	flycheck-pylintrc ".pylintrc"))		".pylintrc")

	;; flycheck & other python stuff should use the local py3 environment		;; flycheck & other python stuff should use the local py3 environment
	(eval . (setq-local		(setq-local flycheck-python-pylint-executable
	flycheck-python-pylint-executable python-shell-interpreter))		python-shell-interpreter)

	;; use 'M-x jedi:show-setup-info' and 'M-x epc:controller' to inspect jedi server		;; use 'M-x jedi:show-setup-info' and 'M-x epc:controller' to inspect jedi server

	;; https://tkf.github.io/emacs-jedi/latest/#jedi:environment-root -- You		;; https://tkf.github.io/emacs-jedi/latest/#jedi:environment-root -- You
	;; can specify a full path instead of a name (relative path). In that case,		;; can specify a full path instead of a name (relative path). In that case,
	;; python-environment-directory is ignored and Python virtual environment		;; python-environment-directory is ignored and Python virtual environment
	;; is created at the specified path.		;; is created at the specified path.
	(eval . (setq-local jedi:environment-root python-shell-virtualenv-root))		(setq-local jedi:environment-root
			python-shell-virtualenv-root)

	;; https://tkf.github.io/emacs-jedi/latest/#jedi:server-command		;; https://tkf.github.io/emacs-jedi/latest/#jedi:server-command
	(eval .(setq-local		(setq-local jedi:server-command
	jedi:server-command
	(list python-shell-interpreter		(list python-shell-interpreter
	jedi:server-script)		jedi:server-script))
	))

	;; jedi:environment-virtualenv --> see above 'python-environment-virtualenv'		;; jedi:environment-virtualenv --> see above 'python-environment-virtualenv'
	;; is set buffer local! No need to setup jedi:environment-virtualenv:		;; is set buffer local! No need to setup jedi:environment-virtualenv:
	@@ -121,13 +155,10 @@
	;;		;;
	;; https://tkf.github.io/emacs-jedi/latest/#jedi:environment-virtualenv		;; https://tkf.github.io/emacs-jedi/latest/#jedi:environment-virtualenv
	;;		;;
	;; (eval . (setq-local		;; (setq-local jedi:environment-virtualenv
	;; jedi:environment-virtualenv
	;; (list (expand-file-name "bin/virtualenv" python-shell-virtualenv-root)		;; (list (expand-file-name "bin/virtualenv" python-shell-virtualenv-root)
	;; ;;"--python"		;; "--python"
	;; ;;"/usr/bin/python3.4"		;; "/usr/bin/python3.4"
	;; )))		;; ))
			))))
	;; jedi:server-args		)

	)))

.dockerignore

0 → 100644

+44 −0

Original line number	Original line	Diff line number	Diff line
			*~
			/~
			//*~
			///~
			////*~

			# Git
			.git
			.gitignore

			# CI
			.codeclimate.yml
			.travis.yml
			.taskcluster.yml

			# Byte-compiled / optimized / DLL files
			__pycache__/
			*/__pycache__/
			//__pycache__/
			//*/__pycache__/
			*.py[cod]
			/.py[cod]
			//*.py[cod]
			///.py[cod]

			# node_modules
			node_modules/
			*/node_modules/
			//node_modules/
			//*/node_modules/
			////node_modules/

			.tx/

			# to sync with .gitignore
			geckodriver.log
			.coverage
			coverage/
			cache/
			build/
			dist/
			local/
			gh-pages/
			*.egg-info/

.gitattributes

+12 −2

Original line number	Original line	Diff line number	Diff line
	searx/static/css/bootstrap.min.css -diff		*.gif -diff
	searx/static/js/bootstrap.min.js -diff		*.png -diff
			*.min.css -diff
			*.min.js -diff
			*.css.map -diff
			*.js.map -diff
			*.eot -diff
			*.svg -diff
			*.ttf -diff
			*.woff -diff
			*.woff2 -diff
			messages.mo -diff