Wykres commitów

1387 Commity (92d69010c7b65d264eb0f4ce8e95fa832289299f)

Autor SHA1 Wiadomość Data
Tim Head 92d69010c7
Merge pull request #652 from betatim/fix-memory-limit
[MRG] Fix handling of memory limit command line argument
2019-04-30 21:34:52 +02:00
Tim Head c56e8b1f21
add note to changelog (#659)
add note to changelog
2019-04-30 19:50:27 +02:00
yuvipanda c8cff1bccc Fix typo in comment 2019-04-30 10:46:34 -07:00
yuvipanda c0a33b340b Add test for integral --build-memory-limit 2019-04-30 10:46:09 -07:00
Joseph Hamman 9ded2b5ee6 add note to changelog 2019-04-30 10:06:24 -07:00
Tim Head 5e67e3c743
Support .binder directory (#653)
Support .binder directory
2019-04-30 18:29:38 +02:00
Joseph Hamman 6de4c5ea6b add unit tests for binder dir 2019-04-30 08:35:58 -07:00
Tim Head 9099def40a
[MRG] install notebook in its own env (#651)
[MRG] install notebook in its own env
2019-04-30 14:25:21 +02:00
Tim Head e2c7de8d19 Update Julia tests for new conda env path 2019-04-30 08:43:19 +02:00
Tim Head e15007d528 Make sure start script is executable 2019-04-30 08:43:19 +02:00
Joseph Hamman 34ad355de6 fix up nix-shell-wrapper for .binder feature 2019-04-29 20:30:07 -07:00
Joseph Hamman 05273abb38 fix bash spacing 2019-04-29 08:52:18 -07:00
Joseph Hamman 7ac4cb4932 error if both binder and .binder dirs exist 2019-04-29 08:05:49 -07:00
Joseph Hamman e83b12f5b2 add missing break 2019-04-29 06:47:51 -07:00
Joseph Hamman 3c0ceaacc2 clarify that only one of binder and .binder can be used at once 2019-04-28 20:28:09 -07:00
Chris Holdgraf 7681a6c774
[MRG] Update issue templates (#654)
[MRG] Update issue templates
2019-04-28 16:50:45 -07:00
Tim Head 991a6826a8
Tweak bug report template 2019-04-28 18:31:46 +02:00
Tim Head e3ee8afa6f Update issue templates 2019-04-28 13:02:41 +02:00
Joseph Hamman 3941a92a7d fix missing () 2019-04-27 17:16:14 -07:00
Joseph Hamman c230c70f4e support for .binder directory 2019-04-27 17:01:20 -07:00
Tim Head 24eb3f923a Fix handling of memory limit command line argument
If a string of only numerals is passed as argument we assume it should
be converted to an integer and specifies a size in bytes.
2019-04-27 10:49:32 +02:00
Min RK 2acf0974c3 miniconda is 4.6.14 2019-04-26 16:25:41 +02:00
Min RK 186e1bbc5d repo-path verifies conda prefix 2019-04-26 16:15:40 +02:00
Min RK 9b7618cb79 refreeze 2019-04-26 16:14:30 +02:00
Min RK 109793bffd conda 4.6.14 2019-04-26 16:09:00 +02:00
Min RK 1f7d91af5f Merge remote-tracking branch 'jhamman/bump_conda_ver' into conda-env 2019-04-26 16:05:38 +02:00
Min RK 70d950cc05 install python2 kernelspec into notebook env
like other things, this was always the right thing to do,
but more important now that notebook prefix is not the same as CONDA_DIR
2019-04-25 17:00:13 +02:00
Min RK 51f15ee7bd update some tests with new expectations
- conda is not importable in the frontmost python
- sys.executable is in $NB_PYTHON_PREFIX (this was true before, but it's value has changed)
2019-04-25 16:51:05 +02:00
Min RK 5f285b74e8 verify conda activation (and thereby entrypoint)
in tests/conda/simple

use pytest for better error reporting
2019-04-25 16:11:23 +02:00
Min RK 36ac03fd9d env is a prefix now 2019-04-25 15:58:44 +02:00
Min RK 15a23711e6 invoke start script from our entrypoint
rather than replacing our entrypoint
2019-04-25 15:56:26 +02:00
Min RK 9678dde251 install notebook in its own env
leave the conda root env alone

adds conda activation to profile.d and ensures that we
start with a login shell via the ENTRYPOINT
2019-04-25 15:44:51 +02:00
Yuvi Panda bc9554e18c
[MRG] Bump nteract-on-jupyter to 2.0.12 and notebook to 5.7.8 (#650)
[MRG] Bump nteract-on-jupyter to 2.0.12 and notebook to 5.7.8
2019-04-24 13:00:57 -07:00
Tim Head 9599b0a43e Bump nteract-on-jupyter to 2.0.12 and notebook to 5.7.8 2019-04-24 20:11:46 +02:00
Min RK eb551eb248
Merge pull request #647 from betatim/unpin-pip
[MRG] Unpin pip again
2019-04-23 14:44:23 +02:00
Tim Head 843b7a5e30 Unpin pip again 2019-04-16 21:49:37 +02:00
Yuvi Panda 746e4d92e0
Merge pull request #646 from betatim/fix-server-proxy
[MRG] Fix up the server proxy package to get websockets back
2019-04-15 15:09:07 -07:00
Tim Head bfa26bdf42 Fix up the server proxy package to get websockets back 2019-04-15 22:58:38 +02:00
Tim Head 0fb6797783
Merge pull request #642 from jupyter/choldgraf-patch-1
mentioning s2i in faq
2019-04-12 22:59:23 +02:00
Chris Holdgraf 2db2f4683c
mentioning s2i in faq 2019-04-12 11:46:13 -07:00
Lindsey Heagy f936cf566c
Merge pull request #640 from betatim/fix-spinx-deprecation
[MRG] Fix sphinx deprecation for recommonmark
2019-04-09 18:34:23 -07:00
Min RK 89fb7a8cf9
Merge pull request #638 from betatim/just-delete-it
[MRG] Remove conda download cache explicitly
2019-04-09 09:04:37 +02:00
Tim Head 9bcc41af82
Merge pull request #641 from betatim/changes-changes-changes
[MRG] Update change log
2019-04-08 16:45:30 +02:00
Tim Head f4e3754434 Update change log 2019-04-08 16:43:49 +02:00
Tim Head f3c7bf7169
Merge pull request #639 from djhoese/git-update-submodules-alimanfoo-20181224-merry-xmas
[MRG] Ensure git submodules are updated and initialized
2019-04-08 16:38:45 +02:00
David Hoese ec6973c5fd
Fix git submodule test sha comparison 2019-04-08 08:26:44 -05:00
David Hoese 4bd1d23469
Add tests for git submodule handling 2019-04-08 08:09:23 -05:00
Alistair Miles 62005f6f15
ensure git submodules are updated and initialised 2019-04-08 08:09:19 -05:00
Tim Head cbb375e156 Black-ify the sphinx configuration code 2019-04-08 07:52:25 +02:00
Tim Head da9f8de0e3 Update recommonmark ocnfiguration
In new versions of SPhinx the way we were configuring the recommonmark
extension has become deprecated. This switches us to the new way of
configuring it.
2019-04-08 07:51:30 +02:00