Wykres commitów

114 Commity (27c2b403dbd3b6bb1b31f687ca4069434301465f)

Autor SHA1 Wiadomość Data
pre-commit-ci[bot] 27c2b403db [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-10-31 22:32:14 +00:00
Erik Sundell 15a1fb6e2d refactor: manually add transitions to f-strings 2022-10-31 21:22:32 +01:00
pre-commit-ci[bot] 5a93542321 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-10-31 21:22:32 +01:00
Erik Sundell 2c0b14c7da ci: refactor r tests, from 8 to 5 (~15 min saved) 2022-10-10 09:15:17 +02:00
Erik Sundell 7e517cfb0a Update R 3.4 from 3.4.0 to 3.4.4 2022-10-08 14:07:00 +02:00
Erik Sundell fc08ee1c58 Update R 4.2 from 4.2.0 to 4.2.1 and fix tests 2022-10-08 14:06:29 +02:00
YuviPanda 0b76608208 Bump default R version to 4.2
Been out for a bit now
2022-07-06 16:39:15 -07:00
YuviPanda 8af47e9985 Add comment about how r_version is determined 2022-06-23 12:34:48 -07:00
YuviPanda 28035d6426 Make sure our default R version is valid semver 2022-06-23 09:14:34 -07:00
YuviPanda e51eae9287 Don't specify older patchlevel as default R 2022-06-23 03:23:47 -07:00
Yuvi Panda a098f95dc4
Point to a tagged version of rstudio
Co-authored-by: Simon Li <orpheus+devel@gmail.com>
2022-06-22 23:37:42 -07:00
Yuvi Panda 232dddac50
Fix typo
Co-authored-by: Simon Li <orpheus+devel@gmail.com>
2022-06-22 13:40:04 -07:00
YuviPanda dfa23f6306 Set custom env vars required for RStudio to work 2022-06-22 08:49:28 -07:00
YuviPanda 9d89d6bd69 Use . instead of source
As Dockerfile executes with /bin/sh, not /bin/bash
2022-06-22 08:49:28 -07:00
YuviPanda a9443f04fe Don't hardcode Ubuntu version when fetching R
This allows us to dynamically change the base image
without having to manually change the version string here
2022-06-22 08:49:28 -07:00
YuviPanda 9c335a5e9e Cleanup apt-update files after installation 2022-06-22 08:49:28 -07:00
YuviPanda ba82209e67 Remove tests that checked if specific R packages were installed 2022-06-22 08:49:28 -07:00
YuviPanda c1ce8fd189 Use apt rather than debi to install packages
apt also seems to fetch dependencies when needed
2022-06-22 08:49:28 -07:00
YuviPanda d72ac15037 Set CRAN mirror URL for R 2022-06-22 08:49:28 -07:00
YuviPanda c123d7bf32 Use new path for Renviron 2022-06-22 08:49:28 -07:00
YuviPanda 4ccbdddeb5 Install package with gdebi
It fetches dependencies and installs them too, unlike dpkg
2022-06-22 08:49:28 -07:00
YuviPanda 13250c73d1 Always provide full semver for R version
Other wise our semver package cries
2022-06-22 08:49:28 -07:00
YuviPanda 22167c35f0 Actually install the downloaded deb 2022-06-22 08:49:28 -07:00
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