From 654199c7059e7c5c4426a3675f15a94a36d04f02 Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Thu, 12 Oct 2023 06:59:45 -0700 Subject: [PATCH 1/2] r: Don't strictly pin version of rsession-proxy If memory serves me right, the specific version semantics were here because at some point we were installing different versions of rsession-proxy for different versions of R. We don't do that anymore, so we should just unpin it and let the pip solver install the appropriate version. Hopefully fixes https://discourse.jupyter.org/t/r-conda-example-repo-isnt-working-any-more/21739/3 --- repo2docker/buildpacks/_r_base.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/repo2docker/buildpacks/_r_base.py b/repo2docker/buildpacks/_r_base.py index f01a43703..e13051245 100644 --- a/repo2docker/buildpacks/_r_base.py +++ b/repo2docker/buildpacks/_r_base.py @@ -11,7 +11,6 @@ def rstudio_base_scripts(r_version): # Shiny server (not the package!) seems to be the same version for all R versions shiny_server_url = "https://download3.rstudio.org/ubuntu-14.04/x86_64/shiny-server-1.5.17.973-amd64.deb" - shiny_proxy_version = "1.1" shiny_sha256sum = "80f1e48f6c824be7ef9c843bb7911d4981ac7e8a963e0eff823936a8b28476ee" # RStudio server has different builds based on wether OpenSSL 3 or 1.1 is available in the base @@ -28,7 +27,6 @@ def rstudio_base_scripts(r_version): rstudio_openssl1_sha256sum = ( "bb88e37328c304881e60d6205d7dac145525a5c2aaaf9da26f1cb625b7d47e6e" ) - rsession_proxy_version = "2.0.1" return [ ( @@ -59,10 +57,10 @@ def rstudio_base_scripts(r_version): ( "${NB_USER}", # Install jupyter-rsession-proxy - rf""" + r""" pip install --no-cache \ - jupyter-rsession-proxy=={rsession_proxy_version} \ - jupyter-shiny-proxy=={shiny_proxy_version} + jupyter-rsession-proxy \ + jupyter-shiny-proxy """, ), ( From 18ab230b0c6c10b99171055ddc2fb9396f54297d Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Thu, 12 Oct 2023 07:49:13 -0700 Subject: [PATCH 2/2] Bump rsession-proxy pin instead We can move to a proper pinning setup later --- repo2docker/buildpacks/_r_base.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/repo2docker/buildpacks/_r_base.py b/repo2docker/buildpacks/_r_base.py index e13051245..8c87f63f9 100644 --- a/repo2docker/buildpacks/_r_base.py +++ b/repo2docker/buildpacks/_r_base.py @@ -11,6 +11,7 @@ def rstudio_base_scripts(r_version): # Shiny server (not the package!) seems to be the same version for all R versions shiny_server_url = "https://download3.rstudio.org/ubuntu-14.04/x86_64/shiny-server-1.5.17.973-amd64.deb" + shiny_proxy_version = "1.1" shiny_sha256sum = "80f1e48f6c824be7ef9c843bb7911d4981ac7e8a963e0eff823936a8b28476ee" # RStudio server has different builds based on wether OpenSSL 3 or 1.1 is available in the base @@ -27,6 +28,7 @@ def rstudio_base_scripts(r_version): rstudio_openssl1_sha256sum = ( "bb88e37328c304881e60d6205d7dac145525a5c2aaaf9da26f1cb625b7d47e6e" ) + rsession_proxy_version = "2.2.0" return [ ( @@ -57,10 +59,10 @@ def rstudio_base_scripts(r_version): ( "${NB_USER}", # Install jupyter-rsession-proxy - r""" + rf""" pip install --no-cache \ - jupyter-rsession-proxy \ - jupyter-shiny-proxy + jupyter-rsession-proxy=={rsession_proxy_version} \ + jupyter-shiny-proxy=={shiny_proxy_version} """, ), (