kopia lustrzana https://github.com/jupyterhub/repo2docker
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/3pull/1310/head
rodzic
d0ad8d3715
commit
654199c705
|
@ -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 (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_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"
|
shiny_sha256sum = "80f1e48f6c824be7ef9c843bb7911d4981ac7e8a963e0eff823936a8b28476ee"
|
||||||
|
|
||||||
# RStudio server has different builds based on wether OpenSSL 3 or 1.1 is available in the base
|
# 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 = (
|
rstudio_openssl1_sha256sum = (
|
||||||
"bb88e37328c304881e60d6205d7dac145525a5c2aaaf9da26f1cb625b7d47e6e"
|
"bb88e37328c304881e60d6205d7dac145525a5c2aaaf9da26f1cb625b7d47e6e"
|
||||||
)
|
)
|
||||||
rsession_proxy_version = "2.0.1"
|
|
||||||
|
|
||||||
return [
|
return [
|
||||||
(
|
(
|
||||||
|
@ -59,10 +57,10 @@ def rstudio_base_scripts(r_version):
|
||||||
(
|
(
|
||||||
"${NB_USER}",
|
"${NB_USER}",
|
||||||
# Install jupyter-rsession-proxy
|
# Install jupyter-rsession-proxy
|
||||||
rf"""
|
r"""
|
||||||
pip install --no-cache \
|
pip install --no-cache \
|
||||||
jupyter-rsession-proxy=={rsession_proxy_version} \
|
jupyter-rsession-proxy \
|
||||||
jupyter-shiny-proxy=={shiny_proxy_version}
|
jupyter-shiny-proxy
|
||||||
""",
|
""",
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
|
|
Ładowanie…
Reference in New Issue