Merge branch 'release/0.13.0'

CHANGELOG

@@ -2,14 +2,27 @@
 ChangeLog
 *********
 
-0.12.1 (2016-05-31)
+0.13.0 (2016-06-17)
+===================
+- Avoid an unnecessary lookup when MFR's OSF provider gets a WaterButler V1 url for
+downloading. (thanks, @pattisdr!)
+- Update the install docs to pin invoke to 0.11.1.
+
+0.12.3 (2016-06-13)
+===================
+- Pin some dependencies and update our travis config to avoid spurious build failures.
+
+0.12.2 (2016-06-13)
 ===================
+- Add a Dockerfile to simplify runninf MFR in dev environments.
+- Pin invoke to v0.11.1.  Our tasks.py is incompatible with v0.13.
 
+0.12.1 (2016-05-31)
+===================
 - When an invalid provider is passed to MFR, HTML escape the url in the error message.
 
 0.12.0 (2016-05-24)
 ===================
-
 - MFR now requires python-3.5!  Make sure to set the SERVER_DEBUG flag to false in your server
 config to avoid the hated "throw() takes 2 positional arguments but 4 were given" error.  
 - Tabular files now sort numish columns numerically!  (thanks, @mfraezz!)
@@ -20,13 +33,11 @@ an Authorization header but no cookie. IOW it can now be used outside the OSF! (
 
 0.11.1 (2016-04-19)
 ===================
-
 - Require admin to set a whitelist of permitted provider domains, to avoid spamming other sites
 with requests.
 
 0.11.0 (2016-04-08)
 ===================
-
 - IPython notebooks are now styled and look **much** better. (thanks, @erinspace!)
 - The OSF (https://osf.io) has moved to Open Sans as the default font, so we shall do the same for
 Markdown, ReStructred Text, and IPython notebooks. (thanks, @mfraezz!)
@@ -35,103 +46,84 @@ Markdown, ReStructred Text, and IPython notebooks. (thanks, @mfraezz!)
 
 0.10.2 (2016-03-21)
 ===================
-
 - Pin WaterButler version to v0.18, the last version using python-3.4.
 
 0.10.1 (2016-03-14)
 ===================
-
 - Fix bug in text encoding detector that was causing utf-8 to always detect as cp-1252.
 
 0.10.0 (2016-02-11)
 ===================
-
 - Markdown and ReStructuredText files are now rendered in their formatted
 display. (thanks, @TomBaxter!)
 - ...oh, and they're styled, too! (thanks, @erinspace!)
 - Update MFR install instructions. (thanks, @rafaeldelucena!)
 
 0.9.6 (2016-02-01)
 ==================
-
 - A few helpful tips for the user when rendering 3D objects
 
 0.9.5 (2016-01-31)
 ==================
-
 - Remove Sentry Ravent Client patch, latest version no longer requires
 patching
 
 0.9.3/4 (2016-01-30)
 ==================
-
 - Updated Sentry Raven Client to send release w/ Tornado patch and tests
 
 0.9.2 (2016-01-30)
 ==================
-
 - Fix to provide IE10 support for JSC3D
 
 0.9.1 (2016-01-30)
 ==================
-
 - Fix to prevent JSC3D CTM Loader from removing download url query parameters
 
 0.9.0 (2016-01-30)
 ==================
-
 - Support for 3D model file formats (.stl, .3ds, .ctm, .obj) via jsc3d,
 https://github.com/humu2009/jsc3d
 - Support for .scad (OpenSCAD) syntax highlighting
 
 0.8.4 (2016-01-27)
 ==================
-
 - Exclude .ico files from image scaling
 
 0.8.3 (2016-01-26)
 ==================
-
 - Support maximum dimensions for images
 - Images larger than maximum dimensions are scaled down
 
 0.8.2 (2015-11-13)
 ==================
-
 - Remove invoke from requirements
 
 0.8.1 (2015-11-13)
 ==================
-
 - Manually garbage collect exceptions to work around issue in python 3.4
 
 0.8.0 (2015-10-22)
 ==================
-
 - Support word breaks in <pre> tags in Firefox.
 - Codepygments extension: remove dependency on bootstrap css; add minimal
   styling to maintain look.
 
 0.7.1 (2015-10-09)
 ==================
-
 - Unpin numpy to avoid error in pandas.
 
 0.7.0 (2015-10-08)
 ==================
-
 - Add support for rendering JASP files
 - Add support for searching tabular renderers
 
 0.6.0 (2015-09-17)
 ==================
-
 - Add support for cookie based authentication for pdfs and pdbs
 
-
 0.1.0 (2015-06-07)
 ==================
-
 - service oriented architecture (SOA)
 - plugin system for providers (file resources)
 - plugin system for extensions (renderers and exporters)

CONTRIBUTING.rst

@@ -45,7 +45,7 @@ Configure development environment and Install the development dependencies.
     $ pip install virtualenv
     $ pip install virtualenvwrapper
     $ mkvirtualenv --python=`which python3` mfr
-    $ pip install invoke
+    $ pip install invoke==0.11.1
 
 
 Lastly, install mfr in development mode. ::

README.md

@@ -29,7 +29,7 @@ After installing python3.5, create the virtual environment with the following co
 pip install virtualenv
 pip install virtualenvwrapper
 mkvirtualenv --python=`which python3` mfr
-pip install invoke
+pip install invoke==0.11.1
 invoke install --develop
 invoke server
 ```

docs/settingup.rst

@@ -7,7 +7,7 @@ Install ``invoke``:
 
 .. code-block:: bash
 
-    pip install invoke
+    pip install invoke==0.11.1
 
 Install requirements:
 

mfr/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '0.12.3'
+__version__ = '0.13.0'
 __import__('pkg_resources').declare_namespace(__name__)

mfr/providers/osf/provider.py

@@ -2,6 +2,7 @@
 import json
 import hashlib
 import logging
+from urllib.parse import urlparse
 import mimetypes
 
 import furl
@@ -84,6 +85,10 @@ async def download(self):
         return streams.ResponseStreamReader(response, unsizable=True)
 
     async def _fetch_download_url(self):
+        # v1 Waterbutler url provided
+        path = urlparse(self.url).path
+        if path.startswith('/v1/resources'):
+            return self.url
         if not self.download_url:
             # make request to osf, don't follow, store waterbutler download url
             request = await self._make_request(

mfr/server/settings.py

@@ -36,7 +36,7 @@
 
 LOCAL_CACHE_PROVIDER_SETTINGS = config.get('LOCAL_CACHE_PROVIDER_SETTINGS', {'folder': '/tmp/mfrlocalcache/'})
 
-ALLOWED_PROVIDER_DOMAINS = config.get('ALLOWED_PROVIDER_DOMAINS', ['http://localhost:5000/'])
+ALLOWED_PROVIDER_DOMAINS = config.get('ALLOWED_PROVIDER_DOMAINS', ['http://localhost:5000/', 'http://localhost:7777/'])
 ALLOWED_PROVIDER_NETLOCS = []
 for domain in ALLOWED_PROVIDER_DOMAINS:
     ALLOWED_PROVIDER_NETLOCS.append(furl.furl(domain).netloc)