Wykres commitów

82 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 4540bf1cc9 Remove conda buildpacks pin of r-irkernel to 1.2
If r-base is pinned, r-irkernel will resolve to a version that is
compatible with it. But if we pin r-irkernel and not r-base, the
opposite will happen and we will end up with an older version of r-base
than is supported by r-irkernel's modern versions.

I find debugging how versions resolve with conda is really tricky, so
unless we have clear principles of what the pin should be and why, I
strongly advocate we don't have it pinned here.

In this case, having r-irkernel pinned to 1.2 caused us to get stuck at
R version 4.1 instead of going to R 4.2 that is now available.
2022-10-10 01:56:16 +02:00
Min RK 1841bf7130
fail on unsupported Python
rather than warning (which users won't see) and building with the wrong version of Python
2022-09-06 10:22:27 +02:00
Min RK 996beea228
missing f in the f-string
Co-authored-by: Simon Li <orpheus+devel@gmail.com>
2022-08-24 13:06:42 +02:00
Min RK 8bf808bd4c
consistent log handling when not using JSON loggers
our logger was never being quite hooked up when not using JSON loggers,
meaning that log messages (such as those fixed here to include newlines) were never shown.
2022-08-22 15:16:40 +02:00
Min RK 42f83f0af4 use mamba for installs once available
MAMBA_EXE is mamba itself, not micromamba
use variable everywhere, so switching fully to micromamba can happen in once place,
assuming they are fully compatible (they _almost_ are, except for `env update` vs `install` in a couple places)
2022-01-28 21:17:09 +01:00
Min RK 84220028bd put micromamba in /usr/local/bin
instead of tmp, since we want it to stick around.
2022-01-28 15:58:36 +01:00
Sylvain Corlay 25bc273a17 Remove -f command-line argument 2022-01-27 01:02:12 +01:00
Sylvain Corlay a0f83c012d Re-add call to clean 2022-01-25 23:58:54 +01:00
Sylvain Corlay 65a36cc3f7 PR review comments: update micromamba, use MAMBA_EXE environment variable 2022-01-21 13:16:33 +01:00
Wolf Vollprecht 3c2ded30be fix rm targets 2022-01-21 11:21:00 +01:00
Madhur Tandon 2d27bb2af6 revert back to using install 2022-01-21 11:21:00 +01:00
Madhur Tandon d2a2c070e7 use experimental build of micromamba 2022-01-21 11:21:00 +01:00
Madhur Tandon b08c7dc3b6 use env update instead of install 2022-01-21 11:21:00 +01:00
Madhur Tandon e12c436af2 add MAMBA_EXE environment variable 2022-01-21 11:21:00 +01:00
Madhur Tandon 9c109f95b4 use latest micromamba and fix MAMBA_ROOT_PREFIX 2022-01-21 11:21:00 +01:00
Madhur Tandon 2e702f0248 rename file and add conda-forge channel to .condarc 2022-01-21 11:21:00 +01:00
Madhur Tandon 3288bca6a4 fix tests + change name of script 2022-01-21 11:21:00 +01:00
Madhur Tandon 6cc7567f2e use micromamba 0.12.2 2022-01-21 11:21:00 +01:00
Madhur Tandon f508bf167e replace mamba & conda with micromamba 2022-01-21 11:20:58 +01:00
YuviPanda 3ea55e9205 Fix call to rstudio_base_scripts 2022-01-04 19:01:26 +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 27399081ff Merge remote-tracking branch 'upstream/main' into no-node 2021-11-19 22:00:10 +05:30
Min RK 90c0e8958c
Merge pull request #1061 from manics/freeze-no-dependabot
Rename requirements.py-3.5.txt to requirements.py-3.5.pip
2021-09-06 09:19:03 +02:00
magnush0lm 72ebf8acf1
__init__.py: r_version: fixed description 2021-08-18 23:11:04 +02:00
Simon Li 470443cc39 Rename requirements.py-3.5.txt to requirements.py-3.5.pip
This is an attempt to have this file ignored by dependabot since it contains frozen dependencies
2021-07-09 18:23:18 +01:00
Min RK e9c22422f6 fix side-effect method name and add fixme note 2021-07-06 09:54:09 +02:00
YuviPanda df92b99cdb Move where npm config is set 2021-07-03 02:09:46 +05:30
YuviPanda ef1497dddf Explicitly specify where npm is
PATH doesn't seem to be set at this point to include
the conda environment we just installed?
2021-07-03 02:09:46 +05:30
YuviPanda cbda2eba2b Move npm config setting to the conda buildpack
Since everything is based off the conda buildpack now,
and that is where we get npm from
2021-07-03 02:09:46 +05:30
Min RK 03d673b096 support separate pip requirements.txt in base env
- require base env to be a lockfile, environment.yml no longer allowed
- separate `requirements.py-x.y.txt` can be processed post-install, if present
- use this for Python 3.5 env, which has some dependencies only from pip (newer versions than the last py35 build on conda-forge)
2021-03-08 12:58:14 +01:00
Min RK 789a3a23c3 lockfiles need to be installed with `conda create` not `conda env create`
use different .lock filename extension, following conda-lock precedent

Could also follow .txt in conda docs!

conda env create -p prefix -f lock.txt *should* work,
but fails with errors about name being required,
but also fails if name is given due to conflict with `-p`
2021-03-03 16:03:52 +01:00
Simon Li 369b57c794
conda: set TIMEFORMAT for timed bash commands 2020-09-24 19:11:48 +01:00
Sylvain Corlay 56fb7e8160 missing -y 2020-09-21 14:22:51 +02:00
Sylvain Corlay 3e07ba2fa5 Fix shell syntax error with time 2020-09-21 14:22:51 +02:00
Min RK 6f9a523b76 install conda packages with mamba
might save us some time

adds timing measurement to most of the commands that take a while,
not sure if we want to keep that
2020-09-21 14:22:51 +02:00
paugier fadb3c8dc8 Bump Black version (20.8b1) and use --target-version=py36 2020-09-10 08:11:29 +02:00
rkevin ce17956601 add www-frame-origin=same to /etc/rstudio/rserver.conf 2020-08-14 06:27:53 -07:00
Min RK c87f642acf avoid deprecated import of collections.abc
deprecated since 3.3, due to be removed in 3.9
2020-07-02 12:57:17 +02:00
YuviPanda 0d0a2f8eb9 Use miniforge instead of miniconda to get conda
[miniforge](https://github.com/conda-forge/miniforge) is a new
community-led installer that uses conda-forge as the default
channel, rather than defaults. This gives us a few advantages:

- No mixing of defaults & conda-forge channel by default. My
  intuition is that this will reduce image size & build times,
  but I don't know enough about conda to say if this is real
- It provides installers for architectures unsupported by miniconda.
  This is particularly useful important for ARM & PowerPC, when we
  want to support those better.
- I like conda-forge, and we should do what we can to support them!
  This is a fairly easy, drop-in way to do so
- It is more likely to have newer versions of conda by default
  than miniconda
- It provides sha256 hashes for installers rather than just md5. This
  makes me personally happy

There should be no user-facing changes here as far as I can tell.

Fixes #858
2020-03-04 14:52:34 +05:30
Uwe L. Korn 3d8b6118e9 Only check str dependencies 2020-01-30 07:43:57 +01:00
Uwe L. Korn e89378aea0 Start RStudio if R is installed via conda 2020-01-29 17:48:39 +01:00
Min RK 930e907ac6
Update repo2docker/buildpacks/conda/__init__.py
Co-Authored-By: Tim Head <betatim@gmail.com>
2019-07-19 08:56:06 +02:00
Min RK 3da5543bfc check for local pip requirements in conda environments 2019-07-18 14:39:35 +02:00
Min RK 70878082f6 conda install occurs in preassemble 2019-07-16 09:02:35 +02:00
Min RK 5cf4f786e8 add assemble_subset
- get_assemble_files() returns list of files needed for assembly
- if buildpack.assemble_with_subset is set, only load assemble_files
  prior to running assembly scripts. Load the rest of the repo afterward

conda opts in to this, but currently I think this works
for everything *except* requirements.txt
2019-07-16 07:55:52 +02:00
Tim Head 391f5bf4af
Revert "[MRG] Remove more files during the image build to slimdown the image" 2019-06-24 15:01:44 +02:00
Tim Head 2ae1dde012 Switch to using -L for `find` instead of -follow 2019-06-21 21:48:02 +02:00