Wykres commitów

91 Commity (965cb15b990980e165c984ed72208159585590d0)

Autor SHA1 Wiadomość Data
YuviPanda 965cb15b99 Get R from RStudio managed apt packages
Might be simpler than getting it from R project managed
apt packages
2022-06-22 08:49:27 -07:00
Min RK d728a64dd9 get version comparison from semver
since Python is removing version string parsing from the standard library

moves Julia-specific semver utilities to top-level
2022-01-26 15:52:09 +01:00
YuviPanda 6ab41efd4d Delete /tmp/downloaded_packages after running install.R
This can often leave ~100-200MB in /tmp that isn't re-used
after the image is set up.
2022-01-25 21:26:16 +05:30
Min RK ad0034cb2f note why --no-install-recommends is important for r packages 2022-01-25 13:29:15 +01:00
Min RK 19acf46392 remove r-recommended package
r-recommended is a collection of common CRAN packages,
which cause conflicts when trying to install older R.

These same packages can be regular dependencies retrieved from CRAN.
2022-01-25 11:38:35 +01:00
YuviPanda c04fff30cd Say 'apt repository' rather than PPA
PPA is a specific kind of apt repository, hosted on
launchpad.net. We use https://cran.r-project.org/bin/linux/ubuntu/,
which is just a regular apt repository. The PPA terminology
always confused me, so this just clears that up
2022-01-10 17:43:09 +05:30
Simon Li 43525352a7
Merge pull request #1107 from yuvipanda/new-r
Bump default R version to 4.1
2022-01-08 14:44:37 +00:00
YuviPanda 7fd9a3d25f Move 3.6.1 back to 3.6.1-3bionic
Was accidentally included along with the 3.6.3-1biocnic
upgrade for 3.6
2022-01-07 11:23:47 +05:30
YuviPanda 05e504a7ce Cleanup some comments 2022-01-07 11:18:02 +05:30
YuviPanda ceb4f8ac4f Hardcode rspm URL as snapshot for IRKernel 2022-01-07 11:17:46 +05:30
YuviPanda 54636c6ecf Bump default R version to 4.1
3.6 is almost 4 years old now.
2022-01-05 22:32:07 +05:30
YuviPanda dbb5ff7c7d Clarify when mran raises valueerror 2022-01-05 21:35:07 +05:30
YuviPanda c398de3d88 Update r 3.6 package version pins
Based on output of apt-cache madison r-base-core
2022-01-05 01:00:47 +05:30
YuviPanda 0b76e9ea44 Always install IRKernel as a binary package
And add another R test for R4.0 + rspm
2022-01-05 00:12:24 +05:30
YuviPanda 5246a0e7c2 Explicitly install r-base-core
Otherwise latest version was being installed, giving us
R 4.1 even when we ask for 4.0
2022-01-04 23:51:15 +05:30
YuviPanda 685c8a0544 Satisfy black 2022-01-04 18:34:33 +05:30
YuviPanda fd6314d07d Solidify logic for picking rspm vs mran
- MRAN doesn't seem to have R 4.1 specific snapshots, so let's
  default to RSPM for anything 4.1+.
- Otherwise, snapshot dates in 2022 will result in using rspm
2022-01-04 18:30:39 +05:30
YuviPanda bca7d849bd Cleanupg RStudio & Shiny server install
- Install a different version of RStudio for R < 4.1,
  as latest RStudio doesn't seem to support those. And
  newer RStudio isn't supported on these older R versions.
- Cleanup how Shiny is installed - install it with the same
  apt invocation as rstudio (saves time), and install shiny-proxy
  from PyPI instead or GitHub. The release on PyPI is the same
  as our previous GitHub pin.
- Remove outdated comment about different behavior for R 3.6 - I
  think now we get all our R versions from the same apt repo. Plus,
  the conditional was adding more scripts than just adding extra apt
  package repos
2021-12-20 18:09:24 +05:30
YuviPanda 5d173a349d Make black happy 2021-12-17 15:56:00 +05:30
YuviPanda 1ed05b59c6 Install devtools, shiny & irkernel from a pin
We were doing this from an old MRAN snapshot. I moved the pin
a little ahead, so IRKernel can also be installed from CRAN
instead of from GitHub. R <= 4.0 gets the old version, and anything
newer gets a more recent version of devtools. This gives us
fast installs for IRkernel with binary packages.

Also add a R 4.0 and R 4.1 test
2021-12-17 15:52:27 +05:30
YuviPanda 290b008ac5 Fix some code comment references to MRAN 2021-12-17 15:17:44 +05:30
YuviPanda 476a25998b Get binary R packages from packagemanager.rstudio.com
packagemanager.rstudio.com is a CRAN mirror provided
by rstudio, with *binary packages* prebuilt for many Linux
Distributions! https://www.rstudio.com/blog/announcing-public-package-manager/
has more excellent detail. It cuts down install times for R packages
by almost 90% in some cases!

Like MRAN (which we use now), they also provide a daily snapshot
of CRAN at that date
(https://docs.rstudio.com/rspm/news/#rstudio-package-manager-2021090).
The URL for CRAN for a particular date can be fetched via an API
call. We call that API, and if there is no snapshot for that date
(anything before Oct 2017), we fall back on to MRAN. Adds a test
to test this fallback.

One possible issue about changing existing binder repos to use binary
builds rather than source builds is that the binary builds sometimes
require you have an apt package installed, and will fail if it is
not. We had to install the zmq library apt package for example -
source installs compile zmq from source, which is where the speedup
comes from. But unlike python wheels or conda packages, these binary
builds are not self-contained - they are linked to apt packages from
the specific distros. So some repos that worked before might fail now.
We can choose a more recent cut-off date to prevent this from happening.
2021-12-17 14:50:46 +05:30
Tim Head 1146d4fbde
Merge pull request #1103 from yuvipanda/quieter-r 2021-12-16 12:14:33 +01:00
YuviPanda 2f1fc81dff Quieter R builds
We redirect stdout (not stderr) of apt-get update and install
in most other places (check out base.py) to not clutter the
output
2021-12-16 12:29:27 +05:30
YuviPanda 730e622e3f Support R 4.1 2021-12-16 12:16:52 +05:30
Gerhard Bräunlich b66caf6f65 buildpacks.r: dont use apt-key directly to respect *_proxy env vars 2021-02-18 16:37:57 +01:00
Yuvi Panda f426891014
Merge pull request #960 from minrk/r4 2021-02-17 17:53:53 +05:30
Min RK edfca79371 Remove support for stencila
Changes in stencila mean it doesn't work anymore and it's not feasible to update nbstencilaproxy

Instead, show only a warning about removed support for stencila
2020-11-19 18:17:23 +01:00
Min RK dd3fa631dd support R 4 2020-09-14 11:55:52 +02:00
Simon Li 6a07a48b2d Test R latest MRAN date handling 2020-02-22 11:29:59 +00:00
Simon Li 5f3fcfcf08 If looking for latest MRAN URL try earlier snapshots too 2020-02-15 16:07:48 +00:00
Uwe L. Korn e89378aea0 Start RStudio if R is installed via conda 2020-01-29 17:48:39 +01:00
Simon Li 0046829e97 r build-pack: when using ppa install r-recommended
Attempt at fixing https://github.com/jupyterhub/mybinder.org-deploy/issues/1308
2019-12-29 23:41:06 +00:00
Tim Head 1c0e44f459 Fix up formatting for black 2019-10-07 09:14:26 +02:00
Pablo Bernabeu 7712583a51
Added Tim's suggestions (link below)
https://github.com/jupyter/repo2docker/pull/803#discussion_r331781100
2019-10-06 15:09:29 +01:00
Pablo Bernabeu a4777a8d43
Update repo2docker/buildpacks/r.py
Co-Authored-By: Tim Head <betatim@gmail.com>
2019-10-06 15:02:27 +01:00
Pablo Bernabeu a7d1395a7e
Fixed packages.append and updated RStudio again 2019-10-05 19:58:37 +01:00
Pablo Bernabeu 20b7b291eb
I tried my best to install r-base-dev
I tried installing r-base-dev as it is advised in RStudio instructions. I did it adding this package wherever r-base was already.
2019-10-05 19:13:55 +01:00
Pablo Bernabeu 0d0824d5d5
Restored RStudio Server version to its current v.
As explained in discussion on the pull request (#803 (comment)), I did the reverse of the last commit. I restored the RStudio Server version to its current version on Binder, and thus only left Shiny Server being updated.
2019-10-03 18:55:34 +01:00
Pablo Bernabeu 52f43e6ed1
Restored Shiny Server version to its current v.
As explained in discussion on the pull request (https://github.com/jupyter/repo2docker/pull/803#issuecomment-538013605), I restored the Shiny Server version to its current version on Binder, and thus only left RStudio being updated.
2019-10-03 17:37:17 +01:00
Pablo Bernabeu 422c1d1a70
Update repo2docker/buildpacks/r.py
Co-Authored-By: Tim Head <betatim@gmail.com>
2019-10-02 22:12:50 +01:00
Pablo Bernabeu 11efede71d
Update repo2docker/buildpacks/r.py
Co-Authored-By: Tim Head <betatim@gmail.com>
2019-10-02 22:12:15 +01:00
Pablo Bernabeu f17dc8133a
Updated RStudio Server and RStudio Shiny Server
From official sites as shown: `# Via https`...
2019-10-02 21:19:33 +01:00
Pablo Bernabeu 7f4297f813
Update r.py 2019-10-02 20:38:42 +01:00
Tim Head 2771ea4220 Use port 80 to download GPG keys to avoid firewall problems 2019-09-18 10:01:41 +02:00
Tim Head d8c8259343 Raise exception for unsupported R versions 2019-09-08 17:19:50 +02:00
Tim Head c50983532e Use LooseVersion to compare versions instead of strings 2019-09-08 14:54:51 +02:00
Tim Head eae42740b6 Add tests for R version handling 2019-09-08 07:25:10 +02:00
Tim Head 0b839428cc Use new way of installing bioconductor 2019-09-07 13:30:46 +02:00
Tim Head e0b1d474bd Add translation from short versions to long versions 2019-09-06 22:12:46 +02:00