hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-08 02:54:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

travis-ci: enable river tests again, numpy package was missing

Browse Source
This commit is contained in:
Marc Tobias Metten
2016-08-03 00:54:49 +02:00
parent b00169e634
commit 9ff24b9107
4 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -18,7 +18,7 @@ script:
- phpunit ./ - phpunit ./
- cd $TRAVIS_BUILD_DIR/tests - cd $TRAVIS_BUILD_DIR/tests
- #lettuce features/api --verbosity=1 - #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 - lettuce features/osm2pgsql --verbosity=1 -t -Fail
notifications: notifications:
email: false email: false

5
tests/features/db/import/linking.feature
View File

@@ -16,7 +16,6 @@ Feature: Linking of places
| R13 | None | R13 | None
| N256 | None | N256 | None
@RiverRhein
Scenario: Waterways are linked when in waterway relations Scenario: Waterways are linked when in waterway relations
Given the scene split-road Given the scene split-road
And the place ways And the place ways
@@ -40,7 +39,6 @@ Feature: Linking of places
| osm_type | osm_type
| R | R
@RiverRhein
Scenario: Relations are not linked when in waterway relations Scenario: Relations are not linked when in waterway relations
Given the scene split-road Given the scene split-road
And the place ways And the place ways
@@ -60,7 +58,6 @@ Feature: Linking of places
| R1 | None | R1 | None
| R2 | None | R2 | None
@RiverRhein
Scenario: Empty waterway relations are handled correctly Scenario: Empty waterway relations are handled correctly
Given the scene split-road Given the scene split-road
And the place ways And the place ways
@@ -74,7 +71,6 @@ Feature: Linking of places
| object | linked_place_id | object | linked_place_id
| R1 | None | R1 | None
@RiverRhein
Scenario: Waterways are not linked when waterway types don't match Scenario: Waterways are not linked when waterway types don't match
Given the scene split-road Given the scene split-road
And the place ways And the place ways
@@ -95,7 +91,6 @@ Feature: Linking of places
| 0 | R | 0 | R
| 1 | W | 1 | W
@RiverRhein
Scenario: Side streams are linked only when they have the same name Scenario: Side streams are linked only when they have the same name
Given the scene split-road Given the scene split-road
And the place ways And the place ways

2
vagrant/install-on-travis-ci.sh
View File

@@ -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 \ sudo apt-get install -y -qq python-Levenshtein python-shapely \
python-psycopg2 tidy python-nose python-tidylib \ 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 sudo -H pip install --quiet 'setuptools>=23.0.0' lettuce==0.2.18 'six>=1.9' haversine

2
vagrant/install-on-ubuntu-16.sh
View File

@@ -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 \ sudo apt-get install -y python-dev python-pip python-levenshtein python-shapely \
python-psycopg2 tidy python-nose python-tidylib \ python-psycopg2 tidy python-nose python-tidylib \
phpunit python-numpy phpunit
pip install --user lettuce==0.2.18 six==1.7 haversine pip install --user lettuce==0.2.18 six==1.7 haversine