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
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
Tim Head
88eaa2305a
refreeze 2019-07-16 ( #745 )
...
refreeze 2019-07-16
2019-07-16 18:57:10 +02:00
Min RK
ddfd3f3464
refreeze 2019-07-16
2019-07-16 15:23:00 +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
Erik Sundell
b4249db4ad
Pin pipenv utilized to version: 2018.11.26
2019-06-25 16:39:48 +02:00
Erik Sundell
09558802d1
Formatting opinion
...
The '//' will render to '/' in the Dockerfile that allows the RUN
command to continue on a new line. I initially added a '//' within a
python string on a blank line in order to format things within the
Python file to look potentially nicer, but this is of little importance
and I have now removed it again.
2019-06-25 16:34:15 +02:00
Erik Sundell
8eae91bc67
Install pipenv in the kernel environ
2019-06-25 16:32:47 +02:00
Erik Sundell
e5d2d4dd85
Make the python environment explicit during pip install
2019-06-25 16:30:02 +02:00
Tim Head
781a1361db
Merge pull request #715 from johnjarmitage/master
...
updated link for the community edition of docker
2019-06-25 13:49:49 +02:00
Tim Head
41da67490f
Move more R config to the build phase
2019-06-25 13:17:56 +02:00
Tim Head
10ca25d986
Install APT packages before copying the repo contents
2019-06-25 12:57:54 +02:00
John
aa3de0c937
updated link for the community edition of docker
2019-06-25 10:42:47 +02:00
Erik Sundell
0ff737df1b
Fix typo
...
Co-Authored-By: Tim Head <betatim@gmail.com>
2019-06-25 09:17:30 +02:00
Erik Sundell
efff66b81b
Fix typo
...
Co-Authored-By: Tim Head <betatim@gmail.com>
2019-06-25 09:17:04 +02:00
Min RK
cd809645a9
Merge pull request #712 from jupyter/revert-709-slimdown-image
...
Revert "[MRG] Remove more files during the image build to slimdown the image"
2019-06-24 15:05:43 +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
Erik Sundell
1bc0a6b206
Pipfile changelog entry
2019-06-24 08:34:22 +02:00
Erik Sundell
6ec9a15037
Iterate on Pipfile documentation
2019-06-24 08:19:01 +02:00
Erik Sundell
61a00f7929
Improve code readability
2019-06-24 07:35:31 +02:00
Erik Sundell
e5160e4b3f
Autoformatting
2019-06-23 06:38:31 +02:00
Erik Sundell
fe2d9b9e0d
Pipfile support for Python 2 as well
2019-06-23 06:29:15 +02:00
Erik Sundell
578fca9273
Add test for using py2 with pipfile
2019-06-23 05:45:25 +02:00
Erik Sundell
ebed504861
semver back to Pipfile.lock
2019-06-23 05:44:54 +02:00