updated tox, travis, and moved gdal script into utils

Author: basaks

.travis.yml

@@ -43,7 +43,7 @@ before_install:
   - pip install -U pip
   - pip install wheel
   - pip install python-daemon==2.1.1
-  - . ./scripts/travis_gdal_install.sh
+  - . ./utils/travis_gdal_install.sh
   - export PATH=$GDALINST/gdal-$GDALVERSION/bin:$PATH
   - export LD_LIBRARY_PATH=$GDALINST/gdal-$GDALVERSION/lib:$LD_LIBRARY_PATH
 
@@ -59,7 +59,8 @@ install:
 
 # command to run tests, e.g. python setup.py test
 script:
-  - py.test --cov-report term-missing:skip-covered --cov=pyrate tests/
+  - if [[ $TRAVIS_PYTHON_VERSION == 2.7 && $GDALVERSION == 2.0.0 ]]; then mpirun -n 4 pytest --cov-report term-missing:skip-covered --cov=pyrate tests/test_mpi.py; fi
+  - pytest --cov-report term-missing:skip-covered --cov=pyrate tests/
 
 cache:
   - apt

tests/test_mpi.py

@@ -50,7 +50,7 @@
                      os.environ['TRAVIS_PYTHON_VERSION'] == '3.5') else False
 GDAL_VERSION = check_output(["gdal-config", "--version"]).decode(
     encoding="utf-8").split('\n')[0]
-MPITEST = TRAVIS and GDAL_VERSION == '2.1.0'
+MPITEST = TRAVIS and GDAL_VERSION == '2.0.0'
 
 
 @pytest.fixture()

tox.ini

@@ -5,11 +5,13 @@ envlist = py27, py33, py34, py35, py36, style, docs
 setenv =
     PYTHONPATH = {toxinidir}:{toxinidir}/PyRate
     PYRATEPATH = {toxinidir}
+    TRAVIS = 'dummy'
 deps =
     numpy >= 1.9.2
     pytest
 commands =
-    py.test --basetemp={envtmpdir}
+    mpirun -n 4 pytest tests/test_mpi.py --basetemp={envtmpdir}
+    py.test --basetemp={envtmpdir} tests -k 'not test_mpi.py'
 
 [testenv:py33]
 deps =
@@ -21,7 +23,7 @@ deps =
 deps =
     pylint
 commands =
-    pylint pyrate --ignore=aps.py
+    pylint pyrate --ignore=pyaps.py
 
 [testenv:docs]
 changedir=docs/