OwlBurst/Ponysearch
1
0
Fork 0
forked from Ponysearch/Ponysearch
Code Pull requests Activity

[mod] remove obsolete virtualenv command

Browse source 
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>
This commit is contained in:
Markus Heiser 2020-12-18 22:31:13 +01:00
parent 14c7cc0e11
commit 1a4524e03c
4 changed files with 10 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.dir-locals.el
View file

@ -25,7 +25,7 @@
;; Alternatively create the virtualenv, source it and install jedi + epc ;; Alternatively create the virtualenv, source it and install jedi + epc
;; (required by `emacs-jedi <https://tkf.github.io/emacs-jedi>`_):: ;; (required by `emacs-jedi <https://tkf.github.io/emacs-jedi>`_)::
;; ;;
;; $ virtualenv --python=python3 "--no-site-packages" ./local/py3 ;; $ python -m venv ./local/py3
;; ... ;; ...
;; $ source ./local/py3/bin/activate ;; $ source ./local/py3/bin/activate
;; (py3)$ # now install into the activated 'py3' environment .. ;; (py3)$ # now install into the activated 'py3' environment ..

8
utils/lib.sh
View file

@ -1399,16 +1399,16 @@ EOF
} }
# apt packages # apt packages
LXC_BASE_PACKAGES_debian="bash git build-essential python3 virtualenv" LXC_BASE_PACKAGES_debian="bash git build-essential python3 python3-venv"
# pacman packages # pacman packages
LXC_BASE_PACKAGES_arch="bash git base-devel python python-virtualenv" LXC_BASE_PACKAGES_arch="bash git base-devel python"
# dnf packages # dnf packages
LXC_BASE_PACKAGES_fedora="bash git @development-tools python virtualenv" LXC_BASE_PACKAGES_fedora="bash git @development-tools python"
# yum packages # yum packages
LXC_BASE_PACKAGES_centos="bash git @development-tools python python-virtualenv" LXC_BASE_PACKAGES_centos="bash git @development-tools python3"
case $DIST_ID in case $DIST_ID in
ubuntu|debian) LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_debian}" ;; ubuntu|debian) LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_debian}" ;;

15
utils/makefile.python
View file

@ -41,19 +41,6 @@ ifeq ($(OS),Windows_NT)
endif endif
VTENV_OPTS ?= VTENV_OPTS ?=
ifeq ($(PYTHON),python)
VIRTUALENV = virtualenv
else
VIRTUALENV = virtualenv --python=$(PYTHON)
endif
ifeq ($(KBUILD_VERBOSE),1)
PIP_VERBOSE =
VIRTUALENV_VERBOSE =
else
PIP_VERBOSE = "-q"
VIRTUALENV_VERBOSE = "-q"
endif
python-help:: python-help::
@echo 'makefile.python:' @echo 'makefile.python:'
@ -125,7 +112,7 @@ quiet_cmd_pyenvuninstall = PYENV uninstall $2
quiet_cmd_virtualenv = PYENV usage: $ source ./$@/bin/activate quiet_cmd_virtualenv = PYENV usage: $ source ./$@/bin/activate
cmd_virtualenv = \ cmd_virtualenv = \
if [ ! -d "./$(PY_ENV)" ];then \ if [ ! -d "./$(PY_ENV)" ];then \
$(VIRTUALENV) $(VIRTUALENV_VERBOSE) $(VTENV_OPTS) $2; \ $(PYTHON) -m venv $(VTENV_OPTS) $2; \
else \ else \
echo "PYENV using virtualenv from $2"; \ echo "PYENV using virtualenv from $2"; \
fi fi

8
utils/searx.sh
View file

@ -43,7 +43,7 @@ SEARX_UWSGI_SOCKET="/run/uwsgi/app/searx/socket"
# apt packages # apt packages
SEARX_PACKAGES_debian="\ SEARX_PACKAGES_debian="\
virtualenv python3-dev python3-babel python3-venv python3-dev python3-babel python3-venv
uwsgi uwsgi-plugin-python3 uwsgi uwsgi-plugin-python3
git build-essential libxslt-dev zlib1g-dev libffi-dev libssl-dev git build-essential libxslt-dev zlib1g-dev libffi-dev libssl-dev
shellcheck" shellcheck"
@ -55,7 +55,7 @@ latexmk"
# pacman packages # pacman packages
SEARX_PACKAGES_arch="\ SEARX_PACKAGES_arch="\
python-virtualenv python python-pip python-lxml python-babel python python-pip python-lxml python-babel
uwsgi uwsgi-plugin-python uwsgi uwsgi-plugin-python
git base-devel libxml2 git base-devel libxml2
shellcheck" shellcheck"
@ -66,7 +66,7 @@ texlive-core texlive-latexextra ttf-dejavu"
# dnf packages # dnf packages
SEARX_PACKAGES_fedora="\ SEARX_PACKAGES_fedora="\
virtualenv python python-pip python-lxml python-babel python python-pip python-lxml python-babel
uwsgi uwsgi-plugin-python3 uwsgi uwsgi-plugin-python3
git @development-tools libxml2 git @development-tools libxml2
ShellCheck" ShellCheck"
@ -79,7 +79,7 @@ dejavu-sans-mono-fonts"
# yum packages # yum packages
SEARX_PACKAGES_centos="\ SEARX_PACKAGES_centos="\
python36-virtualenv python36 python36-pip python36-lxml python-babel python36 python36-pip python36-lxml python-babel
uwsgi uwsgi-plugin-python3 uwsgi uwsgi-plugin-python3
git @development-tools libxml2 git @development-tools libxml2
ShellCheck" ShellCheck"