Expose raster_size in create_export method of project model. Resolve conflicts with dev branch.

Author: aaronxsu

README.rst

@@ -21,6 +21,17 @@ Usage
    # Get TMS URl without token
    one_project.tms()
 
+Versions
+~~~~~~~~
+
+The latest version of `rasterfoundry` always points to the most recently released swagger spec in
+the raster-foundry/raster-foundy-api-spec repository. If you need to point to a different spec
+version, either install a version of the python client that refers to the appropriate spec, or
+set the `RF_API_SPEC_PATH` environment variable to a url or local file path pointing to the
+version of the spec that you want to use.
+
+Generally this shouldn't matter, because the Raster Foundry API shouldn't have breaking changes.
+
 
 Installation
 ------------

rasterfoundry/api.py

@@ -1,19 +1,28 @@
-import os
 import json
+import os
 import uuid
 
-from bravado.requests_client import RequestsClient
 from bravado.client import SwaggerClient
-from bravado.swagger_model import load_file
+from bravado.requests_client import RequestsClient
+from bravado.swagger_model import load_file, load_url
 from simplejson import JSONDecodeError
 
+
 from .models import Project, MapToken, Analysis, Export
-from .exceptions import RefreshTokenException
 from .aws.s3 import str_to_file
+from .exceptions import RefreshTokenException
 from .settings import RV_TEMP_URI
 
-SPEC_PATH = os.path.join(os.path.dirname(os.path.realpath(__file__)),
-                         'spec.yml')
+try:
+    from urllib.parse import urlparse
+except ImportError:
+    from urlparse import urlparse
+
+
+SPEC_PATH = os.getenv(
+    'RF_API_SPEC_PATH',
+    'https://raw.githubusercontent.com/raster-foundry/raster-foundry-api-spec/master/spec.yml'
+)
 
 
 class API(object):
@@ -34,7 +43,10 @@ def __init__(self, refresh_token=None, api_token=None,
         self.http = RequestsClient()
         self.scheme = scheme
 
-        spec = load_file(SPEC_PATH)
+        if urlparse(SPEC_PATH).netloc:
+            spec = load_url(SPEC_PATH)
+        else:
+            spec = load_file(SPEC_PATH)
 
         self.app_host = host
         spec['host'] = host

rasterfoundry/models/project.py

@@ -123,7 +123,7 @@ def get_thumbnail(self, bbox, zoom, export_format, raw):
         response.raise_for_status()
         return response
 
-    def create_export(self, bbox, zoom=10):
+    def create_export(self, bbox, zoom=10, raster_size=4000):
         """Create an export job for this project
 
         Args:
@@ -133,7 +133,8 @@ def create_export(self, bbox, zoom=10):
         Returns:
             Export
         """
-        return Export.create_export(self.api, bbox=bbox, zoom=zoom, project=self)
+        return Export.create_export(
+            self.api, bbox=bbox, zoom=zoom, project=self, raster_size=raster_size)
 
     def geotiff(self, bbox, zoom=10, raw=False):
         """Download this project as a geotiff