From 9ff24b9107b469d1b30b413c8648fde0ad983af3 Mon Sep 17 00:00:00 2001
From: Marc Tobias Metten <mtmail@gmx.net>
Date: Wed, 3 Aug 2016 00:54:49 +0200
Subject: [PATCH] travis-ci: enable river tests again, numpy package was
 missing

---
 .travis.yml                              | 2 +-
 tests/features/db/import/linking.feature | 5 -----
 vagrant/install-on-travis-ci.sh          | 2 +-
 vagrant/install-on-ubuntu-16.sh          | 2 +-
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5a3adc28..13c3d68d 100644
--- 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 57621700..299087ae 100644
--- 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-travis-ci.sh b/vagrant/install-on-travis-ci.sh
index 0bbf1cd4..fdaec162 100755
--- 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 3506e4bc..e077989f 100755
--- 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
 
-- 
2.39.5