Yuvi Panda
be3ca5802d
Merge pull request #81 from jupyter/ellisonbg-patch-2
...
Update virtualenv base to use jupyterlab 0.27
2017-09-27 12:30:07 -07:00
Yuvi Panda
02ecaf36bf
Merge pull request #74 from minrk/environment-excludes-requirements
...
don't install requirements.txt if environment.yml is present
2017-09-27 12:29:52 -07:00
Yuvi Panda
e879d510ef
Merge pull request #80 from jupyter/ellisonbg-patch-1
...
Update JupyterLab to 0.27
2017-09-27 11:31:58 -07:00
Brian E. Granger
2bad694c66
Update detectors to use jupyterlab 0.27
2017-09-27 11:07:45 -07:00
Min RK
4be50e71e7
remove impossible elif condition
2017-09-27 20:04:57 +02:00
Brian E. Granger
54ee2401ef
Update JupyterLab to 0.27
...
How would we run commands to install JupyterLab packages which require running bash commands such as `jupyter labextension install foo`? @blink1073
2017-09-27 10:57:35 -07:00
Carol Willing
b28aef7346
Merge pull request #79 from jupyter/debug_docs
...
document `--debug`
2017-09-25 09:50:19 -07:00
Chris Holdgraf
0a36546640
document `--debug`
2017-09-16 10:20:58 -07:00
Yuvi Panda
85091097cc
Merge pull request #77 from natbusa/master
...
More forgiving rmtree
2017-09-11 12:14:59 -07:00
Natalino Busa
a9f9255541
More forgiving rmtree
2017-09-12 00:54:59 +08:00
Chris Holdgraf
065d00aa71
Merge pull request #75 from minrk/typo
...
typo: --print-dockerfile ended up falling under --debug
2017-09-08 14:30:24 -07:00
Chris Holdgraf
742b9678a6
Merge pull request #76 from minrk/jupyterhub-build-arg
...
make JUPYTERHUB_VERSION a build arg
2017-09-08 07:54:27 -07:00
Min RK
579bf664bb
allow setting JUPYTERHUB_VERSION via env
2017-09-08 11:32:32 +02:00
Min RK
dd25515a83
ensure composed buildpacks inherit application config
...
so that configurable buildpacks can be configured
2017-09-07 14:30:17 +02:00
Min RK
654e6c8ede
fix legacy docker
...
appendix was just skipped
2017-09-07 14:22:15 +02:00
Min RK
dd82e688e7
make jupyterhub a build arg
...
and verify that it's installed in tests
2017-09-07 14:22:15 +02:00
Min RK
05b8d662ea
typo: --print-dockerfile ended up falling under --debug
2017-09-07 14:21:11 +02:00
Min RK
123900fdbb
conda's not Python specific
2017-09-07 14:20:30 +02:00
Min RK
b20ee4adb9
don't install requirements.txt if environment.yml is present
...
The most likely cause of both being present is equivalent dependencies for two use cases,
not a single multi-stage conda environment.
If deps should be installed in conda with pip, they will be in `environment.yml` under `pip`.
2017-09-07 13:21:23 +02:00
yuvipanda
d97eee9a6a
Bump version number
2017-09-06 12:47:23 -07:00
Yuvi Panda
8db1d43210
Merge pull request #68 from yuvipanda/print-dockerfile
...
Add --debug & --no-build options
2017-09-06 12:43:42 -07:00
Yuvi Panda
30d7fd1290
Merge pull request #69 from yuvipanda/master
...
Bump verison number
2017-08-27 11:18:14 -04:00
yuvipanda
d116c30498
Output Dockerfile contents if set to --debug
...
The Dockerfile we generate won't really work at all outside
of repo2docker. This makes it very clear that these are purely
for debugging purposes.
2017-08-27 11:04:01 -04:00
yuvipanda
3b226d183b
Add --print-dockerfile & --no-build options
2017-08-27 10:51:01 -04:00
Min RK
3612d1ac0d
Merge pull request #67 from tdalseide/master
...
Moved old COPYING.md to LICENSE, and updated with current language.
2017-08-26 21:53:30 -04:00
tdalseide
1348829fd0
Moved old COPYING.md to LICENSE, and updated with current language.
2017-08-26 20:30:15 +02:00
Yuvi Panda
430712503b
Merge pull request #65 from sumalaika/master
...
Add license - Issue #64
2017-08-26 11:40:15 -04:00
sumalaika
bef0fc729d
Add files via upload
2017-08-26 10:26:49 -04:00
yuvipanda
dbf4d16a61
Remove unneeded print function import
...
We only support 3.4
2017-08-14 12:00:54 -07:00
yuvipanda
c2a5a84652
Bump version number
2017-08-14 11:42:13 -07:00
Yuvi Panda
47b3b196a6
Merge pull request #59 from yuvipanda/master
...
Include package_data in setup.py
2017-08-13 13:33:53 -07:00
yuvipanda
bef5f1f969
Include package_data in setup.py
...
This was causing all conda based builds to fail
2017-08-11 17:15:35 -07:00
Yuvi Panda
f9862b3ce5
Merge pull request #58 from yuvipanda/include-files
...
Include package_data in setup.py
2017-08-02 01:49:34 -07:00
yuvipanda
385f2bbe10
Include package_data in setup.py
...
This was causing all conda based builds to fail
2017-08-02 01:29:50 -07:00
Yuvi Panda
e26cd53f11
Merge pull request #57 from yuvipanda/npm
...
Add npm to base image
2017-08-02 00:28:12 -07:00
yuvipanda
d6a4cc241e
Add npm to base image
...
Too many things require npm to build now
2017-08-01 23:18:15 -07:00
Chris Holdgraf
fbfcf5f0ba
Merge pull request #56 from choldgraf/auto_doc
...
config file for RTD
2017-08-01 13:27:37 -04:00
Chris Holdgraf
0dc23b55be
config file for RTD
2017-08-01 13:20:50 -04:00
Chris Holdgraf
98b7be02b6
Merge pull request #55 from choldgraf/auto_doc
...
fixing conf import
2017-08-01 13:15:48 -04:00
Chris Holdgraf
93a8b822f2
fixing conf import
2017-08-01 13:14:58 -04:00
Chris Holdgraf
aacec3a9ca
Merge pull request #54 from choldgraf/auto_doc
...
fixing RTD build
2017-08-01 13:12:49 -04:00
Chris Holdgraf
a406b725bf
fixing RTD build
2017-08-01 13:11:06 -04:00
Yuvi Panda
5ff540e733
Merge pull request #53 from choldgraf/auto_doc
...
updating autogen examples
2017-08-01 09:11:39 -07:00
Chris Holdgraf
44ce5c171d
updating autogen examples
2017-08-01 11:21:06 -04:00
Yuvi Panda
5ef2c1f0bc
Merge pull request #51 from choldgraf/auto_doc
...
adding doc generation from the tests
2017-07-31 21:44:53 -07:00
Chris Holdgraf
c14542f0a2
adding doc generation from the tests
2017-08-01 00:09:04 -04:00
Yuvi Panda
f444ffe8b6
Merge pull request #50 from yuvipanda/julia-verify
...
Validate that Julia is using our pre-installed conda
2017-07-30 11:38:00 -07:00
yuvipanda
92d0c5e6d6
Make julia verify check for libpython path
...
PyCall.python just seems to say 'python'
2017-07-30 11:22:28 -07:00
yuvipanda
cd7c151959
Filter all of src too when adding to tar
...
This also seems to be required to more consistently use the
Docker build cache.
2017-07-30 11:20:38 -07:00
yuvipanda
4dcda6c32b
Validate that Julia is using our pre-installed conda
2017-07-30 10:41:13 -07:00