git.iko.soy/searx
on master help sign in
[mod] remove obsolete virtualenv command

Installation and use of the command 'virtualenv' was only needed in py2 and py2 is no longer suported by searx. In py3 the command is replaced by 'python -m venv'. Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>

commit1a4524e03c2091b896f7efadb0b3a646888bd2ba authorMarkus Heiser <markus.heiser@darmarit.de> dateFri 18 Dec 2020, 22:31 (6 years ago) parent14c7cc0
4 files changed+10−23
compare with master
unifiedsplit
.dir-locals.el+1−1 utils/lib.sh+4−4 utils/makefile.python+1−14 utils/searx.sh+4−4
.dir-locals.el+1−1
@@ -25,7 +25,7 @@
2525;; Alternatively create the virtualenv, source it and install jedi + epc
2626;; (required by `emacs-jedi <https://tkf.github.io/emacs-jedi>`_)::
2727;;
28−;; $ virtualenv --python=python3 "--no-site-packages" ./local/py3
28+;; $ python -m venv ./local/py3
2929;; ...
3030;; $ source ./local/py3/bin/activate
3131;; (py3)$ # now install into the activated 'py3' environment ..
utils/lib.sh+4−4
@@ -1399,16 +1399,16 @@ EOF
13991399}
14001400
14011401# apt packages
1402−LXC_BASE_PACKAGES_debian="bash git build-essential python3 virtualenv"
1402+LXC_BASE_PACKAGES_debian="bash git build-essential python3 python3-venv"
14031403
14041404# pacman packages
1405−LXC_BASE_PACKAGES_arch="bash git base-devel python python-virtualenv"
1405+LXC_BASE_PACKAGES_arch="bash git base-devel python"
14061406
14071407# dnf packages
1408−LXC_BASE_PACKAGES_fedora="bash git @development-tools python virtualenv"
1408+LXC_BASE_PACKAGES_fedora="bash git @development-tools python"
14091409
14101410# yum packages
1411−LXC_BASE_PACKAGES_centos="bash git @development-tools python python-virtualenv"
1411+LXC_BASE_PACKAGES_centos="bash git @development-tools python3"
14121412
14131413case $DIST_ID in
14141414 ubuntu|debian) LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_debian}" ;;
utils/makefile.python+1−14
@@ -41,19 +41,6 @@ ifeq ($(OS),Windows_NT)
4141endif
4242
4343VTENV_OPTS ?=
44−ifeq ($(PYTHON),python)
45− VIRTUALENV = virtualenv
46−else
47− VIRTUALENV = virtualenv --python=$(PYTHON)
48−endif
49−
50−ifeq ($(KBUILD_VERBOSE),1)
51− PIP_VERBOSE =
52− VIRTUALENV_VERBOSE =
53−else
54− PIP_VERBOSE = "-q"
55− VIRTUALENV_VERBOSE = "-q"
56−endif
5744
5845python-help::
5946 @echo 'makefile.python:'
@@ -125,7 +112,7 @@ quiet_cmd_pyenvuninstall = PYENV uninstall $2
125112quiet_cmd_virtualenv = PYENV usage: $ source ./$@/bin/activate
126113 cmd_virtualenv = \
127114 if [ ! -d "./$(PY_ENV)" ];then \
128− $(VIRTUALENV) $(VIRTUALENV_VERBOSE) $(VTENV_OPTS) $2; \
115+ $(PYTHON) -m venv $(VTENV_OPTS) $2; \
129116 else \
130117 echo "PYENV using virtualenv from $2"; \
131118 fi
utils/searx.sh+4−4
@@ -43,7 +43,7 @@ SEARX_UWSGI_SOCKET="/run/uwsgi/app/searx/socket"
4343
4444# apt packages
4545SEARX_PACKAGES_debian="\
46−virtualenv python3-dev python3-babel python3-venv
46+python3-dev python3-babel python3-venv
4747uwsgi uwsgi-plugin-python3
4848git build-essential libxslt-dev zlib1g-dev libffi-dev libssl-dev
4949shellcheck"
@@ -55,7 +55,7 @@ latexmk"
5555
5656# pacman packages
5757SEARX_PACKAGES_arch="\
58−python-virtualenv python python-pip python-lxml python-babel
58+python python-pip python-lxml python-babel
5959uwsgi uwsgi-plugin-python
6060git base-devel libxml2
6161shellcheck"
@@ -66,7 +66,7 @@ texlive-core texlive-latexextra ttf-dejavu"
6666
6767# dnf packages
6868SEARX_PACKAGES_fedora="\
69−virtualenv python python-pip python-lxml python-babel
69+python python-pip python-lxml python-babel
7070uwsgi uwsgi-plugin-python3
7171git @development-tools libxml2
7272ShellCheck"
@@ -79,7 +79,7 @@ dejavu-sans-mono-fonts"
7979
8080# yum packages
8181SEARX_PACKAGES_centos="\
82−python36-virtualenv python36 python36-pip python36-lxml python-babel
82+python36 python36-pip python36-lxml python-babel
8383uwsgi uwsgi-plugin-python3
8484git @development-tools libxml2
8585ShellCheck"