git.iko.soy/searx
on master help sign in
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>

commitf32b4fceddf698f6a33c42a866ca21c6cc202841 authorMarkus Heiser <markus.heiser@darmarit.de> dateThu 2 Apr 2020, 20:27 (7 years ago) parent2441e24
3 files changed+8−8
compare with master
unifiedsplit
utils/lib.sh+4−4 utils/makefile.python+1−1 utils/searx.sh+3−3
utils/lib.sh+4−4
@@ -952,7 +952,7 @@ pkg_install() {
952952 ;;
953953 arch)
954954 # shellcheck disable=SC2068
955− pacman -S --noconfirm $@
955+ pacman -Sy --noconfirm $@
956956 ;;
957957 fedora)
958958 # shellcheck disable=SC2068
@@ -1098,13 +1098,13 @@ EOF
10981098}
10991099
11001100# apt packages
1101−LXC_BASE_PACKAGES_debian="bash git build-essential python3"
1101+LXC_BASE_PACKAGES_debian="bash git build-essential python3 virtualenv"
11021102
11031103# pacman packages
1104−LXC_BASE_PACKAGES_arch="bash git base-devel python"
1104+LXC_BASE_PACKAGES_arch="bash git base-devel python python-virtualenv"
11051105
11061106# dnf packages
1107−LXC_BASE_PACKAGES_fedora="bash git @development-tools python"
1107+LXC_BASE_PACKAGES_fedora="bash git @development-tools python virtualenv"
11081108
11091109case $DIST_ID in
11101110 ubuntu|debian) LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_debian}" ;;
utils/makefile.python+1−1
@@ -30,7 +30,6 @@ PYLINT_RC ?= .pylintrc
3030TEST_FOLDER ?= ./tests
3131TEST ?= .
3232
33−VTENV_OPTS = "--no-site-packages"
3433PY_ENV = ./$(LXC_ENV_FOLDER)local/py$(PY)
3534PY_ENV_BIN = $(PY_ENV)/bin
3635PY_ENV_ACT = . $(PY_ENV_BIN)/activate
@@ -41,6 +40,7 @@ ifeq ($(OS),Windows_NT)
4140 PY_ENV_ACT = $(PY_ENV_BIN)/activate
4241endif
4342
43+VTENV_OPTS ?=
4444ifeq ($(PYTHON),python)
4545 VIRTUALENV = virtualenv
4646else
utils/searx.sh+3−3
@@ -42,7 +42,7 @@ SEARX_UWSGI_SOCKET="/run/uwsgi/app/searx/socket"
4242
4343# apt packages
4444SEARX_PACKAGES_debian="\
45−python3-dev python3-babel python3-venv
45+virtualenv python3-dev python3-babel python3-venv
4646uwsgi uwsgi-plugin-python3
4747git build-essential libxslt-dev zlib1g-dev libffi-dev libssl-dev
4848shellcheck"
@@ -53,7 +53,7 @@ texlive-latex-recommended texlive-extra-utils ttf-dejavu"
5353
5454# pacman packages
5555SEARX_PACKAGES_arch="\
56−python python-pip python-lxml python-babel
56+python-virtualenv python python-pip python-lxml python-babel
5757uwsgi uwsgi-plugin-python
5858git base-devel libxml2
5959shellcheck"
@@ -64,7 +64,7 @@ texlive-core texlive-latexextra ttf-dejavu"
6464
6565# dnf packages
6666SEARX_PACKAGES_fedora="\
67−python python-pip python-lxml python-babel
67+virtualenv python python-pip python-lxml python-babel
6868uwsgi uwsgi-plugin-python3
6969git @development-tools libxml2
7070ShellCheck"