lasers
/
searx
mirror of https://github.com/searx/searx
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

LXC: add virtualenv to LXC_BASE_PACKAGES 

Commit 09a40625 adds virtualenv dependency.  BTW remove deprecated
--no-site-packages.  Not having access to global site-packages is now the
default behavior.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
This commit is contained in:
Markus Heiser 2020-04-02 20:27:44 +02:00
parent 2441e24288
commit f32b4fcedd
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
utils/lib.sh
View File

@ -952,7 +952,7 @@ pkg_install() {
;; ;;
arch) arch)
# shellcheck disable=SC2068 # shellcheck disable=SC2068
pacman -S --noconfirm $@ pacman -Sy --noconfirm $@
;; ;;
fedora) fedora)
# shellcheck disable=SC2068 # shellcheck disable=SC2068
@ -1098,13 +1098,13 @@ EOF
} }
# apt packages # apt packages
LXC_BASE_PACKAGES_debian="bash git build-essential python3" LXC_BASE_PACKAGES_debian="bash git build-essential python3 virtualenv"
# pacman packages # pacman packages
LXC_BASE_PACKAGES_arch="bash git base-devel python" LXC_BASE_PACKAGES_arch="bash git base-devel python python-virtualenv"
# dnf packages # dnf packages
LXC_BASE_PACKAGES_fedora="bash git @development-tools python" LXC_BASE_PACKAGES_fedora="bash git @development-tools python virtualenv"
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}" ;;

2
utils/makefile.python
View File

@ -30,7 +30,6 @@ PYLINT_RC ?= .pylintrc
TEST_FOLDER ?= ./tests TEST_FOLDER ?= ./tests
TEST ?= . TEST ?= .
VTENV_OPTS = "--no-site-packages"
PY_ENV = ./$(LXC_ENV_FOLDER)local/py$(PY) PY_ENV = ./$(LXC_ENV_FOLDER)local/py$(PY)
PY_ENV_BIN = $(PY_ENV)/bin PY_ENV_BIN = $(PY_ENV)/bin
PY_ENV_ACT = . $(PY_ENV_BIN)/activate PY_ENV_ACT = . $(PY_ENV_BIN)/activate
@ -41,6 +40,7 @@ ifeq ($(OS),Windows_NT)
PY_ENV_ACT = $(PY_ENV_BIN)/activate PY_ENV_ACT = $(PY_ENV_BIN)/activate
endif endif
VTENV_OPTS ?=
ifeq ($(PYTHON),python) ifeq ($(PYTHON),python)
VIRTUALENV = virtualenv VIRTUALENV = virtualenv
else else

6
utils/searx.sh
View File

@ -42,7 +42,7 @@ SEARX_UWSGI_SOCKET="/run/uwsgi/app/searx/socket"
# apt packages # apt packages
SEARX_PACKAGES_debian="\ SEARX_PACKAGES_debian="\
python3-dev python3-babel python3-venv virtualenv 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"
@ -53,7 +53,7 @@ texlive-latex-recommended texlive-extra-utils ttf-dejavu"
# pacman packages # pacman packages
SEARX_PACKAGES_arch="\ SEARX_PACKAGES_arch="\
python python-pip python-lxml python-babel python-virtualenv 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"
@ -64,7 +64,7 @@ texlive-core texlive-latexextra ttf-dejavu"
# dnf packages # dnf packages
SEARX_PACKAGES_fedora="\ SEARX_PACKAGES_fedora="\
python python-pip python-lxml python-babel virtualenv 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"