Merge remote-tracking branch 'upstream/master'

[nominatim.git] / vagrant / install-on-travis-ci.sh

diff --git a/vagrant/install-on-travis-ci.sh b/vagrant/install-on-travis-ci.sh
index fa2a43e0e9a24ef643813c45281c13e59701a2d0..2522f05f3e9bba408ed7c024c6499c5fd2e0a020 100755 (executable)
--- a/vagrant/install-on-travis-ci.sh
+++ b/vagrant/install-on-travis-ci.sh
@@ -13,12 +13,12 @@
 
 sudo apt-get update -qq
 sudo apt-get install -y -qq libboost-dev libboost-system-dev \
-                            libboost-filesystem-dev libexpat1-dev zlib1g-dev libxml2-dev\
+                            libboost-filesystem-dev libexpat1-dev zlib1g-dev\
                             libbz2-dev libpq-dev libproj-dev \
                             postgresql-server-dev-9.6 postgresql-9.6-postgis-2.4 postgresql-contrib-9.6 \
                             apache2 php php-pgsql php-intl
 
-sudo apt-get install -y -qq python3-dev python3-pip python3-psycopg2 php-cgi
+sudo apt-get install -y -qq python3-dev python3-pip php-cgi
 
 pip3 install --quiet behave nose pytidylib psycopg2-binary
 
@@ -26,6 +26,9 @@ pip3 install --quiet behave nose pytidylib psycopg2-binary
 composer global require "squizlabs/php_codesniffer=*"
 sudo ln -s /home/travis/.config/composer/vendor/bin/phpcs /usr/bin/
 
+composer global require "phpunit/phpunit=7.*"
+sudo ln -s /home/travis/.config/composer/vendor/bin/phpunit /usr/bin/
+
 sudo -u postgres createuser -S www-data
 
 # Make sure that system servers can read from the home directory: