Wykres commitów

810 Commity (main)

Autor SHA1 Wiadomość Data
Erik Sundell 920ddd86ac
Update conda from 23.7.4 to 24.3.0 2024-03-24 22:16:05 +01:00
Sylvain Corlay 01d818b974 Update to mamba 1.5.7 2024-03-22 21:34:50 +01:00
pre-commit-ci[bot] f2c1cb7a8c [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-02-05 20:28:56 +00:00
Samuel Gaist 09e503c4e6 feat: respect the root folder configured when looking for ignore files
See the design chapter for more details.
2024-01-19 08:45:06 +00:00
Samuel Gaist a51235f9a5 fix: remove the ignore .git folder default when no exclude files are present 2024-01-19 08:45:06 +00:00
Samuel Gaist d6670f4378 refactor: use list comprehension rather filter+lambda 2024-01-19 08:45:06 +00:00
Samuel Gaist 3028d07182 fix: create src directory in any case
The original behavior was to create an src directory with the content of the
repository. The creation would happen in any case (remote or local repository).
With the filtering in place and the default to remove the .git folder, it breaks
the build as the src folder can be missing.

This patch ensures that the directory is present in the tar so the build can
continue as it did until now.
2024-01-19 08:45:06 +00:00
Samuel Gaist 6b8b2334e7 feat: implement support for dockerignore and containerignore
Currently repo2docker creates a context object that includes the whole content
of the repository it builds an image for. Thus it includes folders like .git
which is usually something that has no interest in the final image, can take
quite a lot of space and most importantly, kills the caching of that layer.

This patch adds support for reading dockerignore and containerignore files that
are used to ensure only the relevant data are used to build the image.

By default it also excludes the .git folder if neither of these files are
provided.
2024-01-19 08:45:06 +00:00
Simon Li 72cfc12a8d rstudio: log-level info to stderr 2023-10-22 19:20:16 +01:00
Simon Li 4b0c7d9bfd conda 23.7.4
error    libmamba Could not solve for environment specs
    The following packages are incompatible
    ├─ conda 23.9.0**  is requested and can be installed;
    └─ mamba 1.5.1**  is not installable because it requires
       └─ conda >=4.14,<23.9.0a0 , which conflicts with any installable versions previously reported.
2023-10-19 10:46:13 +05:30
Simon Li 2e26e773b7 ./freeze.py 2023-10-19 10:46:13 +05:30
Simon Li 3ec7d41bce mamba 1.5.1 conda 23.9.0 2023-10-19 10:46:13 +05:30
YuviPanda 18ab230b0c Bump rsession-proxy pin instead
We can move to a proper pinning setup later
2023-10-12 07:49:13 -07:00
YuviPanda 654199c705 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
2023-10-12 06:59:45 -07:00
Erik Sundell 3fe6c75a88
Merge pull request #1287 from yuvipanda/bump
Upgrade base image from to Ubuntu 22.04 from 18.04
2023-09-18 11:53:35 +02:00
Simon Li d414e994fc
Merge pull request #1299 from SylvainCorlay/update-mamba-1.4.9
Update conda and mamba
2023-07-18 16:12:28 +01:00
Sylvain Corlay fbe7ebad53 Update conda and mamba 2023-07-18 12:06:16 +01:00
Yamato Matsuoka 6a0d76a308 Fix rstudio-build selection 2023-07-08 12:50:12 -04:00
YuviPanda e586b26110 Upgrade base image to Ubuntu 22.04
18.04 was EOL May 2023, with only paid support now available
(https://ubuntu.com/blog/18-04-end-of-standard-support).

Let's bump the default base image to 22.04. This might break
some repos that have apt.txt based packages, but I don't
really think there's a way around that. If specific package pinning
is needed, users unfortunately need to use a Dockerfile.

Ref https://github.com/jupyterhub/repo2docker/issues/1258
2023-06-13 13:03:05 +05:30
pre-commit-ci[bot] 18e76f9d38 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-06-11 07:40:57 +00:00
YuviPanda 5947b756ba Use correct method to format datetime 2023-06-11 13:09:48 +05:30
YuviPanda 9f1a6406b6 Use correct type to represent cutoff date 2023-06-11 13:09:40 +05:30
YuviPanda 0dfce76775 Throw a useful error message when snapshot is too old 2023-06-11 13:04:28 +05:30
YuviPanda a0fd8743b2 Remove mentions of MRAN 2023-06-11 12:56:53 +05:30
YuviPanda 6c719bd671 Remove unnecessary method call 2023-06-11 12:55:34 +05:30
Min RK 8500d479a5
Stop using MRAN
- remove cutoff for picking RSPM, always use it
- remove now-redundant r4.0-mran test
- shift base R 3.6 snapshot date to after October 2017, when rspm snapshots seem to have started
- update docs to point to RSPM
2023-06-09 13:19:59 +02:00
Min RK e8eab153e7
Merge pull request #909 from yuvipanda/feat/new-base
Let `FROM <base_image>` in the Dockerfile template be configurable
2023-06-09 13:15:14 +02:00
Min RK e1051c3cb8
Merge branch 'main' into feat/new-base 2023-06-09 12:24:20 +02:00
Erik Sundell 8bb242d40c Refreeze conda buildpack's dependencies 2023-06-08 11:36:22 +02:00
Erik Sundell 90252fd30d Pin jupyter-server, previously held back to v1 by jupyterlab 3.4.* 2023-06-08 11:33:29 +02:00
Erik Sundell 07be88950b Only pin to major versions as input to freeze 2023-06-08 09:16:21 +02:00
Kacper Kowalik (Xarthisius) 7bf02d8101
Update the location of R packagemanager
Fixes #1272
2023-05-23 18:47:32 -05:00
Min RK 39d203cc80
missing `f` in julia fetch error f-string 2023-04-11 12:02:00 +02:00
Erik Sundell f87c86c625 conda buildpack: refreeze environments 2023-04-09 17:26:53 +02:00
YuviPanda 5f383fd8cd Remove deprecated nteract_on_jupyter
Last release was in 2019, and it has been explicilty
deprecated for a while
https://github.com/nteract/nteract/issues/5554#issuecomment-852434391

TLJH plans to remove it in https://github.com/jupyterhub/the-littlest-jupyterhub/pull/869
2023-04-09 17:26:31 +02:00
Yuvi Panda 049320301c
Merge pull request #1256 from SylvainCorlay/mamba-1-4
Update to mamba 1.4.0
2023-03-28 20:49:45 +05:30
Yuvi Panda b52ea663ac
Merge pull request #1248 from minrk/memoize-getters
avoid duplicate log statements by memoizing getters
2023-03-28 20:49:13 +05:30
YuviPanda 5894f63b87 Merge remote-tracking branch 'upstream/main' into feat/new-base 2023-03-23 22:21:02 +05:30
Sylvain Corlay de908c9213 Update to mamba 1.4.0 and conda 23.1.0 2023-03-23 16:45:57 +01:00
Min RK 70a2de4e12
@lru_cache requires Python 3.8, use older @lru_cache() 2023-03-23 16:00:23 +01:00
Min RK 1e1d6ac20f
memoize all getters explicitly
rather than automatically
2023-03-23 15:58:27 +01:00
YuviPanda f848c81073 Install libssl-dev unconditionally for R 2023-03-23 20:02:49 +05:30
Min RK 66b8765c69
Remove unspecified Python version case
- removes lockfile copies without version
- enforces that `buildpack.python_version` is always specified (major_pythons['3'] in cases where it could have been falsy before)
- warns when Python version is unspecified, which ensures future reproducibility failures
2023-02-17 13:00:27 +01:00
Min RK 52be2d3d64
memoize getters
ensures `get_` functions are called only once,
avoiding duplicate log statements
2023-02-16 13:13:17 +01:00
Min RK 1a2438d34e
default env is 3.10 2023-02-16 12:44:18 +01:00
Min RK ceb25f85f2
Merge remote-tracking branch 'origin/main' into new-default 2023-02-16 12:41:48 +01:00
Yuvi Panda 8c0f49ed89
Merge pull request #1237 from TimStewartJ/tim/rsession-library-path
Add Conda env library path to RStudio configuration
2023-02-15 11:00:07 -08:00
Erik Sundell 6d6e5ffd1b
Merge pull request #1239 from minrk/3.11
Support Python 3.11 and upgrade jupyterhub from 1.5.0 to 3.1.1
2023-02-15 19:28:29 +01:00
Min RK 0f328e67e7
Julia 0.6 needs Jupyter from py35 environment 2023-02-15 15:24:15 +01:00
Roberto Di Remigio Eikås b84abf3b77
Update install-nix.bash 2023-02-11 11:34:32 +01:00