Merge tag '0.25.5' into develop

CenterForOpenScience · Apr 25, 2018 · f4a5cd2 · f4a5cd2
2 parents 3a955ac + fbe2cca
commit f4a5cd2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -2,6 +2,10 @@
 ChangeLog
 *********
 
+0.25.5 (2018-04-25)
+===================
+- Fix: Upgrade WaterButler dependency to take advantage of the new Google Cloud Storage provider.
+
 0.25.4 (2018-04-06)
 ===================
 - Fix: When no exporter exists for the given extension, throw the "No supported exporter" error,

diff --git a/mfr/providers/osf/provider.py b/mfr/providers/osf/provider.py
@@ -143,7 +143,7 @@ async def download(self):
             response = await aiohttp.request('GET', response.headers['location'])
             self.metrics.add('download.saw_redirect', True)
 
-        return streams.ResponseStreamReader(response, unsizable=True)
+        return streams.ResponseStreamReader(response)
 
     async def _fetch_download_url(self):
         """Provider needs a WaterButler URL to download and get metadata.  If ``url`` is already

diff --git a/mfr/version.py b/mfr/version.py
@@ -1 +1 @@
-__version__ = '0.25.4'
+__version__ = '0.25.5'
diff --git a/requirements.txt b/requirements.txt
@@ -10,7 +10,7 @@ stevedore==1.2.0
 tornado==4.3
 
 # WaterButler
-git+https://github.com/CenterForOpenScience/waterbutler.git@0.19.0#egg=waterbutler
+git+https://github.com/CenterForOpenScience/waterbutler.git@0.38.6#egg=waterbutler
 agent==0.1.2
 
 # CodePygments