Merge pull request #317 from minrk/r-first

prefer R to conda in buildpack order

repo2docker/app.py

@@ -66,8 +66,8 @@ class Repo2Docker(Application):
             LegacyBinderDockerBuildPack,
             DockerBuildPack,
             JuliaBuildPack,
-            CondaBuildPack,
             RBuildPack,
+            CondaBuildPack,
             PythonBuildPack,
         ],
         config=True,

repo2docker/buildpacks/r.py

@@ -4,6 +4,7 @@ import datetime
 
 from .python import PythonBuildPack
 
+
 class RBuildPack(PythonBuildPack):
     """
     Setup R for use with a repository
@@ -169,7 +170,7 @@ class RBuildPack(PythonBuildPack):
                 "${NB_USER}",
                 # Install nbrsessionproxy
                 r"""
-                pip install --no-cache-dir nbrsessionproxy==0.6.1 && \
+                pip install --no-cache-dir nbrsessionproxy==0.7.0 && \
                 jupyter serverextension enable nbrsessionproxy --sys-prefix && \
                 jupyter nbextension install --py nbrsessionproxy --sys-prefix && \
                 jupyter nbextension enable --py nbrsessionproxy --sys-prefix