Merge remote-tracking branch 'upstream/master' into travis-ci

diff --git a/.travis.yml b/.travis.yml
index 5a3adc2885e63cb738f98877bf586bc8151b0ace..13c3d68d4004af067cc6b3eb4cd42bf6e584416e 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,7 @@ script:
   - phpunit ./
   - cd $TRAVIS_BUILD_DIR/tests
   - #lettuce features/api --verbosity=1
-  - lettuce features/db --verbosity=1 -t -Fail -t -RiverRhein -t -Tiger -t -poldi-only
+  - lettuce features/db --verbosity=1 -t -Fail -t -Tiger -t -poldi-only
   - lettuce features/osm2pgsql --verbosity=1 -t -Fail
 notifications:
   email: false

diff --git a/tests/features/db/import/linking.feature b/tests/features/db/import/linking.feature
index 576217007c6d2a0d4f8624dc0f480953444b425a..299087aef7e01fcbd93c6fe23317e7443440147a 100644 (file)
--- a/tests/features/db/import/linking.feature
+++ b/tests/features/db/import/linking.feature
@@ -16,7 +16,6 @@ Feature: Linking of places
          | R13     | None
          | N256    | None
 
-    @RiverRhein
     Scenario: Waterways are linked when in waterway relations
         Given the scene split-road
         And the place ways
@@ -40,7 +39,6 @@ Feature: Linking of places
          | osm_type
          | R
 
-    @RiverRhein
     Scenario: Relations are not linked when in waterway relations
         Given the scene split-road
         And the place ways
@@ -60,7 +58,6 @@ Feature: Linking of places
          | R1     | None
          | R2     | None
 
-    @RiverRhein
     Scenario: Empty waterway relations are handled correctly
         Given the scene split-road
         And the place ways
@@ -74,7 +71,6 @@ Feature: Linking of places
          | object | linked_place_id
          | R1     | None
 
-    @RiverRhein
     Scenario: Waterways are not linked when waterway types don't match
         Given the scene split-road
         And the place ways
@@ -95,7 +91,6 @@ Feature: Linking of places
           |  0 | R
           |  1 | W
 
-    @RiverRhein
     Scenario: Side streams are linked only when they have the same name
         Given the scene split-road
         And the place ways

diff --git a/vagrant/install-on-centos-7.sh b/vagrant/install-on-centos-7.sh
index 7e023cbef9487012df7f32a95ab15fd2402e3ed6..52ae5d0c553addac9b42b7b28aaf9180e2b28bad 100755 (executable)
--- a/vagrant/install-on-centos-7.sh
+++ b/vagrant/install-on-centos-7.sh
@@ -28,7 +28,7 @@
 # additional packages:
 
     sudo yum install -y python-pip python-Levenshtein python-psycopg2 \
-                        php-phpunit-PHPUnit
+                        python-numpy php-phpunit-PHPUnit
     pip install --user --upgrade pip setuptools lettuce==0.2.18 six==1.9 \
                                  haversine Shapely pytidylib
 

diff --git a/vagrant/install-on-travis-ci.sh b/vagrant/install-on-travis-ci.sh
index 0bbf1cd44564ef82888285791855e1bae7d9def6..fdaec16217a5ec00b426750df1fe9161334346b2 100755 (executable)
--- a/vagrant/install-on-travis-ci.sh
+++ b/vagrant/install-on-travis-ci.sh
@@ -24,7 +24,7 @@ sudo apt-get install -y -qq libboost-dev libboost-system-dev \
 
 sudo apt-get install -y -qq python-Levenshtein python-shapely \
                         python-psycopg2 tidy python-nose python-tidylib \
-                        phpunit
+                        python-numpy phpunit
 
 sudo -H pip install --quiet 'setuptools>=23.0.0' lettuce==0.2.18 'six>=1.9' haversine
 

diff --git a/vagrant/install-on-ubuntu-16.sh b/vagrant/install-on-ubuntu-16.sh
index 3506e4bc6d112199dc196765deaf132018234a0a..e077989fb41251738028dc5a38be888b612676d8 100755 (executable)
--- a/vagrant/install-on-ubuntu-16.sh
+++ b/vagrant/install-on-ubuntu-16.sh
@@ -32,7 +32,7 @@ sudo update-locale LANG=en_US.UTF-8 #DOCS:
 
     sudo apt-get install -y python-dev python-pip python-levenshtein python-shapely \
                             python-psycopg2 tidy python-nose python-tidylib \
-                            phpunit
+                            python-numpy phpunit
 
     pip install --user lettuce==0.2.18 six==1.7 haversine