Merge pull request #675 from jbouffard/travis-fix

Travis Fixes

.travis.yml

@@ -39,12 +39,12 @@ install:
   - tar -xvf archives/spark-2.3.1-bin-hadoop2.7.tgz
   - pip3 install -r requirements.txt
   - pip3 install pyproj
-  - pip3 install pylint
   - if [[ $TRAVIS_PYTHON_VERSION == "3.3" ]]; then
     pip3 install pathlib;
     fi
   - if [[ $TRAVIS_PYTHON_VERSION != "3.3" ]]; then
     pip3 install matplotlib==2.0.0;
+    pip3 install pylint;
     fi
   - pip3 install colortools==0.1.2
   - pip3 install awscli
@@ -61,7 +61,9 @@ script:
   - export SPARK_HOME=./spark-2.3.1-bin-hadoop2.7/
   - export JAVA_HOME=/usr/lib/jvm/java-8-oracle
   - ./test_script.sh
-  - pylint geopyspark
+  - if [[ $TRAVIS_PYTHON_VERSION != "3.3" ]]; then
+    pylint geopyspark;
+    fi
 
 before_deploy:
   - export GEOPYSPARK_VERSION_SUFFIX="-${TRAVIS_COMMIT:0:7}"

geopyspark/geotrellis/rasterio.py

@@ -37,7 +37,7 @@ def crs_to_proj4(crs):
 
 def _read_windows(uri, xcols, ycols, bands, crs_to_proj4):
 
-    if ("GDAL_DATA" not in os.environ) and (_GDAL_DATA != None):
+    if ("GDAL_DATA" not in os.environ) and (_GDAL_DATA is not None):
         os.environ["GDAL_DATA"] = _GDAL_DATA
 
     with rasterio.open(uri) as dataset:

requirements.txt

@@ -1,6 +1,6 @@
 pytest>=3.0.6
 numpy>=1.8
-shapely>=1.6b3
+shapely>=1.6.4.post2
 rasterio==1.0a7
 setuptools
 protobuf>=3.3.0