Wykres commitów

795 Commity (0d78f4890973098b7b2b53f38664bb3dd001ad17)

Autor SHA1 Wiadomość Data
Chris Holdgraf 544b1ba039 improving ref checker 2018-06-27 11:35:17 -07:00
Chris Holdgraf 728fb9707e adding a ref checker util 2018-06-27 09:25:07 -07:00
Chris Holdgraf 8beb5e07bc checking for origin/ explicitly 2018-06-27 08:30:10 -07:00
Chris Holdgraf b1f504c480 Merge branch 'docs' of https://github.com/choldgraf/repo2docker into docs 2018-06-27 08:26:01 -07:00
Chris Holdgraf c035dd22d4 auto-cleaning refs and updating tests for this 2018-06-27 08:25:05 -07:00
J. Forde 2d6f32e588 closes #297 #326 2018-06-26 18:01:13 -07:00
J. Forde e1d47df30e fixing conflict 2018-06-26 15:54:31 -07:00
Min RK 8adc402a04 Split run_image into two steps
for easier testing of image-running logic
2018-06-15 13:08:20 +02:00
Tim Head 0f0ce8a950
Merge pull request #327 from toddrme2178/patch-1
Include LICENSE file in wheels
2018-06-09 08:18:21 +02:00
Todd 3be7099970
Include LICENSE file in wheels
The license requires that all copies of the software include the license.  This makes sure the license is included in the wheels.  See the wheel documentation [here](https://wheel.readthedocs.io/en/stable/#including-the-license-in-the-generated-wheel-file) for more information.
2018-06-08 16:57:51 -04:00
Chris Holdgraf 97a8a3acff
Merge pull request #324 from betatim/update-conda
Switch to miniconda v4.5.1
2018-06-07 10:26:43 +01:00
Tim Head 157ce1e1e7 Add root conda environment to expected output 2018-06-06 21:52:41 +02:00
Tim Head ba6aa63085 Switch to miniconda v4.5.1 2018-06-06 19:07:53 +02:00
Chris Holdgraf 2dc4874261
Merge pull request #318 from GladysNalvarte/test_images
Checks if the environment.yml file is empty and if it contains a dict…
2018-06-05 23:43:56 +01:00
Gladys Nalvarte 43f367c590 Update the TypeError message and example in the unit test. 2018-06-04 12:56:20 +02:00
Tim Head d4c9c8858a
Merge pull request #320 from ryanlovett/master
Support shiny apps
2018-05-26 06:09:46 +02:00
Ryan Lovett e871f35076
Merge pull request #1 from betatim/ryan-shiny-support
Fix parentheses in the build scripts for R buildpack
2018-05-25 09:01:17 -07:00
Tim Head c688b70696 Fix parentheses in the build scripts for R buildpack 2018-05-25 08:14:14 +02:00
ryanlovett f90758057a Update comment. 2018-05-24 09:50:19 -07:00
ryanlovett 60dc622b31 Merge branch 'master' of github.com:jupyterhub/repo2docker 2018-05-24 09:49:05 -07:00
ryanlovett 4a6bbae7da Install shiny library. 2018-05-24 09:48:17 -07:00
Gladys Nalvarte 63e459664c Updated test_env_yml.py file 2018-05-24 15:29:48 +02:00
Gladys Nalvarte 709ac4c757 Checks if the environment.yml file is empty and if it contains a dictionary.
If the environment.yml is empty, an empty dictionary is instantiated.
This will rise an TypeError if the environment.yml file contains a list
or other data structure different than a dictionary.
2018-05-24 13:31:04 +02:00
Chris Holdgraf 42ad233e74
Merge pull request #317 from minrk/r-first
prefer R to conda in buildpack order
2018-05-23 13:22:12 -07:00
ryanlovett 6deda3cd7a Create shiny-server output directories. 2018-05-23 11:13:11 -07:00
ryanlovett 106087cedb Install shiny-server. 2018-05-23 10:34:05 -07:00
Chris Holdgraf 9dc63967ab
Merge pull request #313 from yuvipanda/local-dir
Use XDG standard ~/.local for user software installs
2018-05-23 07:54:16 -07:00
Min RK 150d1d245e fix verify script for ~/.local/bin 2018-05-23 16:03:07 +02:00
Min RK 3092365890 nbrsessionproxy to 0.7
for shiny support!
2018-05-23 15:52:24 +02:00
Min RK 91fdfb4c29 prefer R to conda
allows mixing conda and R because R inherits from Python (and thereby conda)
2018-05-23 15:52:08 +02:00
Chris Holdgraf 808b6fa20b
Update faq.md 2018-05-19 10:06:10 -07:00
Chris Holdgraf 2f2fde8a11 short docs explanation 2018-05-19 08:02:59 -07:00
yuvipanda 5005c309cc Modify usr-bin test 2018-05-18 18:23:54 -07:00
Tim Head f818fd82be Add test to check for extra directory on PATH 2018-05-18 18:23:20 -07:00
yuvipanda 751531b632 Use XDG standard ~/.local for user software installs
~/.local is also where things like pip install --user
seem to install things, so we should use that instead of ~/local.
2018-05-18 18:22:49 -07:00
Tim Head a6c001a391
Merge pull request #311 from aborruso/patch-1
To add the user bin folder to the path
2018-05-16 07:49:05 +02:00
Chris Holdgraf 36ed1bf80c
Merge pull request #308 from betatim/link-to-github
Add links to the front page and modify travis
2018-05-15 14:09:04 -07:00
Chris Holdgraf da3522851f
removing extra curly brackets 2018-05-12 11:32:39 -07:00
Andrea Borruso cd6371c313
Update base.py 2018-05-12 10:05:42 +02:00
Andrea Borruso c8a31b8baf
To add the user bin folder to the path
Here thread https://github.com/jupyterhub/binderhub/issues/557
2018-05-12 08:54:39 +02:00
Tim Head 72292061d2 Allow for longer periods of no output during R tests 2018-05-11 23:13:18 +02:00
Tim Head 8861382a76 Add bug, chat and contrib links to the front page
It should be easier to find us to ask questions, report bugs and to get
started contributing.
2018-05-10 21:55:20 +02:00
Kyle Kelley 7a50772a53
Merge pull request #306 from yuvipanda/bump-nteract
Bump nteract jupyter extension
2018-05-08 15:08:30 -07:00
yuvipanda b9f2242876 Bump nteract jupyter extension 2018-05-08 13:32:20 -07:00
Tim Head f73db1121e
Merge pull request #298 from minrk/always-conda-python
Always install Python with conda
2018-05-08 10:33:03 +02:00
Min RK 85f69a74df
Merge pull request #303 from minrk/rm-nb-ext-conf
remove _nb_ext_conf from legacy env
2018-05-08 09:26:37 +02:00
Min RK 2b2eaa8b69 remove some duplicate READMEs from tests
since we don't need every one included in the docs

adds detail to the one that remains
2018-05-07 15:42:45 +02:00
Chris Holdgraf 5b212d9655
Merge pull request #302 from minrk/1804
bump base image to ubuntu 18.04
2018-04-26 08:13:40 -07:00
Min RK 7b58a62817 set DEBIAN_FRONTEND=noninteractive
avoids possible prompts during setup of apt packages
2018-04-26 12:46:37 +02:00
Min RK 5070db1bee remove _nb_ext_conf from legacy env
_nb_ext_conf adds configuration that requires nb_conda_kernels,
which has been removed, preventing launch
2018-04-26 10:26:55 +02:00