Scott Henderson
5ea4c29b83
bump conda minor version to 4.7.10 and refreeze
2019-07-29 17:30:50 +00:00
Scott Henderson
955e422101
clarify application of environment.yml
2019-07-29 17:23:09 +00:00
Scott Henderson
62e10d6891
switched pip packages to conda-forge
2019-07-29 17:23:09 +00:00
Chris Holdgraf
bf29f66f27
Merge pull request #752 from betatim/fix-preassemble-r-py-combo
...
[MRG] Call parent preassemble scripts methods
2019-07-23 13:15:52 -07:00
Tim Head
e24e5d91ca
Add test for R buildpack's get_preassemble_script_files
2019-07-23 18:23:30 +02:00
Tim Head
01c785f6fc
Call parent preassemble scripts methods
...
Without this we don't collect the files that other build packs need to
copy them over to the container in the pre-assemble stage.
2019-07-23 07:33:06 +02:00
Tim Head
6c5c09b62b
Merge pull request #743 from minrk/conda-env-first-again-again
...
[MRG] preassembly for conda/python
2019-07-19 10:36:15 +02: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
Tim Head
74af2ad83c
Merge pull request #748 from minrk/pipfile-toml
...
parse pipfiles to determine Python version
2019-07-18 21:48:35 +02:00
Tim Head
1774f8c68b
Merge pull request #746 from minrk/typo
...
typo in doi regexp
2019-07-18 21:38:57 +02:00
Min RK
31da8e32b1
run chown as root
2019-07-18 17:55:38 +02:00
Min RK
8236dc8ae1
only install pipenv in preassemble
...
save preassembly of pipenv for a later patch
2019-07-18 16:25:04 +02:00
Min RK
79c2617873
parse pipfiles to determine Python version
...
these are structured files, no need to use regular expressions to parse them
2019-07-18 16:13:41 +02:00
Min RK
dd6cd93585
typo in doi regexp
...
must use `r` prefix when there are escapes
2019-07-18 14:41:01 +02:00
Min RK
009d09815a
test local pip requirements
2019-07-18 14:40:17 +02:00
Min RK
654be046ac
set permissions on repo_dir prior to preassemble
2019-07-18 14:40:08 +02:00
Min RK
3da5543bfc
check for local pip requirements in conda environments
2019-07-18 14:39:35 +02:00
Tim Head
88eaa2305a
refreeze 2019-07-16 ( #745 )
...
refreeze 2019-07-16
2019-07-16 18:57:10 +02:00
Min RK
4f3f192d2f
preassembly for pipfiles
2019-07-16 15:52:39 +02:00
Min RK
d6e66c886d
preassemble python
2019-07-16 15:52:39 +02:00
Min RK
ddfd3f3464
refreeze 2019-07-16
2019-07-16 15:23:00 +02:00
Min RK
70878082f6
conda install occurs in preassemble
2019-07-16 09:02:35 +02:00
Min RK
5b12e072b1
move stencila to preassemble
2019-07-16 08:35:35 +02:00
Min RK
b6ab2a9986
check requirements.txt for local references
...
allows assemble_from_subset when requirements.txt doesn't contain any local references
2019-07-16 07:56:11 +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
Min RK
5ef42fc2af
Merge pull request #718 from betatim/early-r
...
[MRG] Install R packages before copying repo contents
2019-07-16 07:30:16 +02:00
David R. Pugh
399b339a4a
[WIP] Version bump Conda from 4.6.14 to 4.7.5 ( #719 )
...
Version bump conda to 4.7.5
Co-authored-by: pughdr <david.pugh@kaust.edu.sa>
2019-07-12 18:50:11 +02:00
Tim Head
09b84811ae
Make sure all loops over dict items are deterministic
2019-07-12 07:23:41 +02:00
Tim Head
fbe3503320
Merge pull request #738 from eexwhyzee/add-bash-to-dockerfile
...
[MRG] Adding bash to Dockerfile to fix git-credential-env
2019-07-11 08:06:52 +02:00
Minh Hoang
9c29cc022d
Missing punctuation
2019-07-10 09:57:12 -07:00
Minh Hoang
ac952c157e
Update changelog
2019-07-10 09:56:00 -07:00
Minh Hoang
a0715be50f
Adding bash to Dockerfile to fix git-credential-env
2019-07-10 09:43:29 -07:00
Tim Head
b16b610192
bump xeus-cling in tests ( #735 )
...
bump xeus-cling in tests
2019-07-09 17:50:24 +02:00
Min RK
bbe2b961ad
bump xeus-cling in tests
...
so we don't have an old env relying on the free channel
2019-07-09 16:12:22 +02:00
Min RK
0d8b8a2ebf
Merge pull request #732 from betatim/fix-zenodo-ci-example
...
[MRG] Switch to binder-examples/requirements for our tests
2019-07-09 10:25:39 +02:00
Tim Head
66227f85b4
Detect failure of pre-assembly in R buildpack
...
If the pre-assembly step succeeds we do not re-run it after copying the
repository contents.
2019-07-06 16:21:29 +02:00
Tim Head
b5a506e0b7
Switch to binder-examples/requirements for our tests
2019-07-06 15:30:21 +02:00
Min RK
a251ad261c
Merge pull request #730 from betatim/remove-print-statements
...
[MRG] Remove print statement and unused import
2019-07-04 12:13:09 +02:00
Tim Head
dd8ba8ec18
Remove print statement and unused import
2019-07-03 06:53:59 +02:00
Tim Head
0eae8dc0c4
Install R packages before copying repo contents
2019-06-28 22:09:32 +02:00
Tim Head
4b0e838136
[MRG] Handle root user case more gracefully. Fixes #696 ( #723 )
...
[MRG] Handle root user case more gracefully. Fixes #696
2019-06-28 22:07:32 +02:00
Kacper Kowalik (Xarthisius)
f80fb4b39b
Handle root user case more gracefully. Fixes #696
...
If user_id is root, exit only from cmdline. Raise exception if r2d was
invoked as a library.
2019-06-28 11:46:01 -05:00
Tim Head
2cded9b4ec
Update target_repo_dir docstring ( #721 )
...
Update target_repo_dir docstring
2019-06-27 12:44:42 +02:00
Fabien Maussion
85b0d80b16
Update target_repo_dir docstring
...
See https://discourse.jupyter.org/t/users-home-in-jupyterhub/1463/3
2019-06-27 08:58:29 +01:00
Tim Head
6e93cb06a4
Merge pull request #649 from consideRatio/pipenv-support
...
[MRG/REVIEW] Support Pipfile / Pipfile.lock with pipenv
2019-06-26 07:26:35 +02:00
Yuvi Panda
f45088b9c5
Merge pull request #716 from betatim/early-apt-get
...
[MRG] Install APT packages before copying the repo contents
2019-06-25 14:48:23 -07:00
Erik Sundell
ec7f20e1a8
Add inline comment about '\'
2019-06-25 21:21:46 +02:00
Erik Sundell
397cb939bc
Correct path typo and add note about '//'
2019-06-25 19:02:17 +02:00
Erik Sundell
7dbee81af6
Syntax typo fix
2019-06-25 17:18:10 +02:00
Erik Sundell
6d508ac5e2
Autoformatting
2019-06-25 16:57:11 +02:00