Merge pull request #1493 from henrykironde/travis-fix

Update kartoza setup on Travis

.travis.yml

@@ -4,17 +4,11 @@ warnings_are_errors: false
 services:
   - docker
 
-# database setup
-before_install:
-  # Make dir corresponding to the version of Postgres used
-  - mkdir -p cli_tools/postgis-data/11/main
-  - chmod +x cli_tools/postgis-data/11/main
-
 # command to run tests using py.test
 script:
   - docker-compose run --service-ports python_retriever pytest -v --cov=retriever
-  - docker-compose run python_retriever flake8 --ignore=E501,W503,E402,F401,F403,E722,F841,W504 retriever --max-line-length=90 > /dev/null 2>&1
-  - docker-compose run python_retriever yapf -d --recursive retriever/ --style=.style.yapf > /dev/null 2>&1
+  - docker-compose run python_retriever flake8 --ignore=E501,W503,E402,F401,F403,E722,F841,W504 retriever --max-line-length=90 2>&1
+  - docker-compose run python_retriever yapf -d --recursive retriever/ --style=.style.yapf 2>&1
 #  - docker-compose run python_retriever pylint -rn retriever/ -f colorized --rcfile=.pylintrc > /dev/null 2>&1
 
 after_success:

appveyor.yml

@@ -65,7 +65,7 @@ build_script:
   - cd C:\projects\retriever
 
 test_script:
-  - py.test -v -k "not test_download_archive and not test_postgres_spatial" >NUL 2>&1
-  - flake8 --ignore=E501,W503,E402,F401,F403,E722,F841,W504 retriever --max-line-length=90 >NUL 2>&1
-  - yapf --recursive retriever/ --style=.style.yapf -d >NUL 2>&1
+  - py.test -v -k "not test_download_archive and not test_postgres_spatial" 2>&1
+  - flake8 --ignore=E501,W503,E402,F401,F403,E722,F841,W504 retriever --max-line-length=90 2>&1
+  - yapf --recursive retriever/ --style=.style.yapf -d 2>&1
 #  - pylint -rn retriever/ -f colorized --rcfile=.pylintrc

docker-compose.yml

@@ -1,4 +1,7 @@
 version: '3'
+volumes:
+  dbbackups:
+  postgis-data:
 
 services:
   mysqldb_retriever:
@@ -13,15 +16,16 @@ services:
   pgdb_retriever:
     image: kartoza/postgis:latest
     volumes:
-      - ./cli_tools/postgis-data:/var/lib/postgresql
-      - ./cli_tools/:/backups
+      - postgis-data:/var/lib/postgresql
+      - dbbackups:/backups
     container_name: pgdb_ret_container
     environment:
       # To create multiple database you can add coma separated databases eg gis,data
       - POSTGRES_DB=testdb_retriever
       - POSTGRES_USER=postgres
       - POSTGRES_PASS=Password12!
       - ALLOW_IP_RANGE=0.0.0.0/0
+      - POSTGRES_MULTIPLE_EXTENSIONS=postgis,hstore,postgis_topology,postgis_raster,pgrouting
     restart: on-failure
 
   python_retriever: