Merge pull request #478 from azavea/rde/fix/filesystem-classes

Small fixes

.travis/test

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-docker run -v $(pwd):$(pwd) --rm -it raster-vision-cpu rm -f $(pwd)/.coverage $(pwd)/coverage.xml
-docker run --rm -it raster-vision-cpu /opt/src/scripts/style_tests && \
+docker run -w $(pwd) -v $(pwd):$(pwd) --rm -it raster-vision-cpu rm -f $(pwd)/.coverage $(pwd)/coverage.xml
+docker run -w $(pwd) -v $(pwd):$(pwd) --rm -it raster-vision-cpu $(pwd)/scripts/style_tests && \
 docker run -w $(pwd) -v $(pwd):$(pwd) --rm -it raster-vision-cpu $(pwd)/scripts/compile && \
 docker run -w $(pwd) -v $(pwd):$(pwd) --rm -it raster-vision-cpu $(pwd)/scripts/unit_tests && \
-docker run -v $(pwd):$(pwd) --rm -it raster-vision-cpu $(pwd)/scripts/integration_tests
+docker run -w $(pwd) -v $(pwd):$(pwd) --rm -it raster-vision-cpu $(pwd)/scripts/integration_tests

Dockerfile-cpu

@@ -29,14 +29,15 @@ RUN pip install -r requirements-dev.txt
 # Install extras_requirements.json
 # Don't install tensorflow
 COPY ./extras_requirements.json /opt/src/extras_requirements.json
-RUN cat extras_requirements.json | jq  '.[][]' | grep -v 'tensorflow' | sort -u  | xargs pip install
+RUN cat extras_requirements.json | jq  '.[][]' | grep -v 'tensorflow' | sort -u | xargs pip install
 
 # Install requirements.txt
 COPY ./requirements.txt /opt/src/requirements.txt
 RUN pip install -r requirements.txt
 
 COPY scripts/rastervision /usr/local/bin/
-COPY ./ /opt/src/
+COPY rastervision /opt/src/rastervision
+COPY scripts/compile /opt/src/scripts/compile
 RUN /opt/src/scripts/compile
 
 CMD ["bash"]

Dockerfile-gpu

@@ -36,7 +36,8 @@ COPY ./requirements.txt /opt/src/requirements.txt
 RUN pip install -r requirements.txt
 
 COPY scripts/rastervision /usr/local/bin/
-COPY ./ /opt/src/
+COPY rastervision /opt/src/rastervision
+COPY scripts/compile /opt/src/scripts/compile
 RUN /opt/src/scripts/compile
 
 CMD ["bash"]

rastervision/filesystem/__init__.py

@@ -1,7 +1,7 @@
 # flake8: noqa
 
-from rastervision.filesystem.filesystem import (FileSystem, NotReadableError,
-                                                NotWritableError)
+from rastervision.filesystem.filesystem import (
+    FileSystem, NotReadableError, NotWritableError, ProtobufParseException)
 from rastervision.filesystem.local_filesystem import LocalFileSystem
 from rastervision.filesystem.s3_filesystem import S3FileSystem
 from rastervision.filesystem.http_filesystem import HttpFileSystem