Fix dev_setup issues

- venv is CAN be setup in custom directory
- restore package installation
- set correct package for python3-venv
pull/1568/head
Åke Forslund 2018-02-09 09:47:11 +01:00 committed by Matthew D. Scholefield
parent 5447983999
commit 0b0919e542
1 changed files with 5 additions and 4 deletions

View File

@ -94,7 +94,7 @@ install_deps() {
$SUDO zypper install -y git python glibc-devel linux-glibc-devel python-devel python2-virtualenv python2-gobject-devel python-virtualenvwrapper libtool libffi-devel libopenssl-devel autoconf automake bison swig glib2-devel portaudio-devel mpg123 flac curl libicu-devel pkg-config pkg-config libjpeg-devel libfann-devel python-curses
$SUDO zypper install -y -t pattern devel_C_C++
elif found_exe apt-get; then
$SUDO apt-get install -y git python python-dev python-setuptools python-venv python-gobject-dev libtool libffi-dev libssl-dev autoconf automake bison swig libglib2.0-dev portaudio19-dev mpg123 screen flac curl libicu-dev pkg-config automake libjpeg-dev libfann-dev build-essential jq
$SUDO apt-get install -y git python python-dev python-setuptools python-gobject-dev libtool libffi-dev libssl-dev autoconf automake bison swig libglib2.0-dev portaudio19-dev mpg123 screen flac curl libicu-dev pkg-config automake libjpeg-dev libfann-dev build-essential jq
elif found_exe pacman; then
$SUDO pacman -S --needed --noconfirm git python2 python2-pip python2-setuptools python2-virtualenv python2-gobject python-virtualenvwrapper libtool libffi openssl autoconf bison swig glib2 portaudio mpg123 screen flac curl pkg-config icu automake libjpeg-turbo base-devel jq
pacman -Qs "^fann$" &> /dev/null || (
@ -123,10 +123,11 @@ TOP=$(cd $(dirname $0) && pwd -L)
VIRTUALENV_ROOT=${VIRTUALENV_ROOT:-"${TOP}/.venv"}
install_venv() {
python3 -m venv .venv/
curl https://bootstrap.pypa.io/get-pip.py | .venv/bin/python
python3 -m venv "${VIRTUALENV_ROOT}/"
curl https://bootstrap.pypa.io/get-pip.py | "${VIRTUALENV_ROOT}/bin/python"
}
#install_deps
install_deps
# Configure to use the standard commit template for
# this repo only.