From d4a3470c9e459481966ca8d128508daba4593d7d Mon Sep 17 00:00:00 2001 From: marc tobias Date: Fri, 7 Feb 2020 15:26:09 +0100 Subject: [PATCH] Vagrant Ubuntu: psycopg2 is required --- vagrant/Install-on-Ubuntu-16.sh | 12 +++++++++--- vagrant/Install-on-Ubuntu-18-nginx.sh | 3 ++- vagrant/Install-on-Ubuntu-18.sh | 6 +++--- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/vagrant/Install-on-Ubuntu-16.sh b/vagrant/Install-on-Ubuntu-16.sh index f84f651c..3539851f 100755 --- a/vagrant/Install-on-Ubuntu-16.sh +++ b/vagrant/Install-on-Ubuntu-16.sh @@ -30,19 +30,25 @@ export DEBIAN_FRONTEND=noninteractive #DOCS: postgresql-server-dev-9.5 postgresql-9.5-postgis-2.2 \ postgresql-contrib-9.5 \ apache2 php php-pgsql libapache2-mod-php \ - php-intl git + php-intl python3-setuptools python3-dev python3-pip \ + python3-tidylib git + + # python3-psycopg2 apt package is too old (2.6), we want at least 2.7 + pip3 install --user psycopg2 # If you want to run the test suite, you need to install the following # additional packages: - sudo apt-get install -y python3-setuptools python3-dev python3-pip \ - python3-psycopg2 python3-tidylib phpunit php-cgi + sudo apt-get install -y php-cgi php-mbstring pip3 install --user behave nose composer global require "squizlabs/php_codesniffer=*" sudo ln -s ~/.config/composer/vendor/bin/phpcs /usr/bin/ + composer global require "phpunit/phpunit=6.*" + sudo ln -s ~/.config/composer/vendor/bin/phpunit /usr/bin/ + # # System Configuration # ==================== diff --git a/vagrant/Install-on-Ubuntu-18-nginx.sh b/vagrant/Install-on-Ubuntu-18-nginx.sh index d93cdc5b..382df6b2 100755 --- a/vagrant/Install-on-Ubuntu-18-nginx.sh +++ b/vagrant/Install-on-Ubuntu-18-nginx.sh @@ -23,7 +23,8 @@ export DEBIAN_FRONTEND=noninteractive postgresql-server-dev-10 postgresql-10-postgis-2.4 \ postgresql-contrib-10 \ nginx php-fpm php php-pgsql \ - php-intl git + php-intl python3-setuptools python3-dev python3-pip \ + python3-psycopg2 python3-tidylib git export USERNAME=vagrant export USERHOME=/home/vagrant diff --git a/vagrant/Install-on-Ubuntu-18.sh b/vagrant/Install-on-Ubuntu-18.sh index 140727a3..7f4ca32f 100755 --- a/vagrant/Install-on-Ubuntu-18.sh +++ b/vagrant/Install-on-Ubuntu-18.sh @@ -30,13 +30,13 @@ export DEBIAN_FRONTEND=noninteractive #DOCS: postgresql-server-dev-10 postgresql-10-postgis-2.4 \ postgresql-contrib-10 postgresql-10-postgis-scripts \ apache2 php php-pgsql libapache2-mod-php \ - php-intl git + php-intl python3-setuptools python3-dev python3-pip \ + python3-psycopg2 python3-tidylib git # If you want to run the test suite, you need to install the following # additional packages: - sudo apt-get install -y python3-setuptools python3-dev python3-pip \ - python3-psycopg2 python3-tidylib phpunit php-cgi + sudo apt-get install -y phpunit php-cgi pip3 install --user behave nose -- 2.45.1