git.iko.soy/searx
on master help sign in
Merge pull request #2401 from return42/drop-virtualenv-cmd
32e4eabAlexandre Flament
.dir-locals.el+1−1
compare with master
unifiedsplit
@@ -25,7 +25,7 @@
25;; Alternatively create the virtualenv, source it and install jedi + epc
25;; Alternatively create the virtualenv, source it and install jedi + epc
26;; (required by `emacs-jedi <https://tkf.github.io/emacs-jedi>`_)::
26;; (required by `emacs-jedi <https://tkf.github.io/emacs-jedi>`_)::
27;;
27;;
28−;; $ virtualenv --python=python3 "--no-site-packages" ./local/py3
28+;; $ python -m venv ./local/py3
29;; ...
29;; ...
30;; $ source ./local/py3/bin/activate
30;; $ source ./local/py3/bin/activate
31;; (py3)$ # now install into the activated 'py3' environment ..
31;; (py3)$ # now install into the activated 'py3' environment ..
utils/lib.sh+7−4
@@ -1399,16 +1399,16 @@ EOF
1399}
1399}
1400
1400
1401# apt packages
1401# 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"
1403
1403
1404# pacman packages
1404# pacman packages
1405−LXC_BASE_PACKAGES_arch="bash git base-devel python python-virtualenv"
1405+LXC_BASE_PACKAGES_arch="bash git base-devel python"
1406
1406
1407# dnf packages
1407# dnf packages
1408−LXC_BASE_PACKAGES_fedora="bash git @development-tools python virtualenv"
1408+LXC_BASE_PACKAGES_fedora="bash git @development-tools python"
1409
1409
1410# yum packages
1410# yum packages
1411−LXC_BASE_PACKAGES_centos="bash git @development-tools python python-virtualenv"
1411+LXC_BASE_PACKAGES_centos="bash git python3"
1412
1412
1413case $DIST_ID in
1413case $DIST_ID in
1414 ubuntu|debian) LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_debian}" ;;
1414 ubuntu|debian) LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_debian}" ;;
@@ -1420,6 +1420,9 @@ esac
1420
1420
1421lxc_install_base_packages() {
1421lxc_install_base_packages() {
1422 info_msg "install LXC_BASE_PACKAGES in container $1"
1422 info_msg "install LXC_BASE_PACKAGES in container $1"
1423+ case $DIST_ID in
1424+ centos) yum groupinstall "Development Tools" -y ;;
1425+ esac
1423 pkg_install "${LXC_BASE_PACKAGES}"
1426 pkg_install "${LXC_BASE_PACKAGES}"
1424}
1427}
1425
1428
utils/makefile.python+1−14
@@ -41,19 +41,6 @@ ifeq ($(OS),Windows_NT)
41endif
41endif
42
42
43VTENV_OPTS ?=
43VTENV_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
57
44
58python-help::
45python-help::
59 @echo 'makefile.python:'
46 @echo 'makefile.python:'
@@ -125,7 +112,7 @@ quiet_cmd_pyenvuninstall = PYENV uninstall $2
125quiet_cmd_virtualenv = PYENV usage: $ source ./$@/bin/activate
112quiet_cmd_virtualenv = PYENV usage: $ source ./$@/bin/activate
126 cmd_virtualenv = \
113 cmd_virtualenv = \
127 if [ ! -d "./$(PY_ENV)" ];then \
114 if [ ! -d "./$(PY_ENV)" ];then \
128− $(VIRTUALENV) $(VIRTUALENV_VERBOSE) $(VTENV_OPTS) $2; \
115+ $(PYTHON) -m venv $(VTENV_OPTS) $2; \
129 else \
116 else \
130 echo "PYENV using virtualenv from $2"; \
117 echo "PYENV using virtualenv from $2"; \
131 fi
118 fi
utils/searx.sh+4−4
@@ -43,7 +43,7 @@ SEARX_UWSGI_SOCKET="/run/uwsgi/app/searx/socket"
43
43
44# apt packages
44# apt packages
45SEARX_PACKAGES_debian="\
45SEARX_PACKAGES_debian="\
46−virtualenv python3-dev python3-babel python3-venv
46+python3-dev python3-babel python3-venv
47uwsgi uwsgi-plugin-python3
47uwsgi uwsgi-plugin-python3
48git build-essential libxslt-dev zlib1g-dev libffi-dev libssl-dev
48git build-essential libxslt-dev zlib1g-dev libffi-dev libssl-dev
49shellcheck"
49shellcheck"
@@ -55,7 +55,7 @@ latexmk"
55
55
56# pacman packages
56# pacman packages
57SEARX_PACKAGES_arch="\
57SEARX_PACKAGES_arch="\
58−python-virtualenv python python-pip python-lxml python-babel
58+python python-pip python-lxml python-babel
59uwsgi uwsgi-plugin-python
59uwsgi uwsgi-plugin-python
60git base-devel libxml2
60git base-devel libxml2
61shellcheck"
61shellcheck"
@@ -66,7 +66,7 @@ texlive-core texlive-latexextra ttf-dejavu"
66
66
67# dnf packages
67# dnf packages
68SEARX_PACKAGES_fedora="\
68SEARX_PACKAGES_fedora="\
69−virtualenv python python-pip python-lxml python-babel
69+python python-pip python-lxml python-babel
70uwsgi uwsgi-plugin-python3
70uwsgi uwsgi-plugin-python3
71git @development-tools libxml2
71git @development-tools libxml2
72ShellCheck"
72ShellCheck"
@@ -79,7 +79,7 @@ dejavu-sans-mono-fonts"
79
79
80# yum packages
80# yum packages
81SEARX_PACKAGES_centos="\
81SEARX_PACKAGES_centos="\
82−python36-virtualenv python36 python36-pip python36-lxml python-babel
82+python36 python36-pip python36-lxml python-babel
83uwsgi uwsgi-plugin-python3
83uwsgi uwsgi-plugin-python3
84git @development-tools libxml2
84git @development-tools libxml2
85ShellCheck"
85ShellCheck"