Wykres commitów

291 Commity (f2c1cb7a8c27726450a6bbbded5099478c8a8994)

Autor SHA1 Wiadomość Data
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
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
Tim Head 405a0f6bbb Remove conda download cache explicitly 2019-04-04 23:04:37 +02:00
Joseph Hamman f9620edd8e freeze versions 2019-04-04 13:35:12 -07:00
Joseph Hamman bf3d0c133c fallback to 4.6.10 2019-04-04 12:29:34 -07:00
Joseph Hamman a3d4f95de0 changelog addition 2019-04-04 11:54:33 -07:00
Joseph Hamman 7e75f9f915 update checksum for conda installer 2019-04-04 11:36:54 -07:00
Joseph Hamman fb335af9b3 bump miniconda and conda versions 2019-04-04 11:32:50 -07:00
Tim Head 4a9f4a5594 Simplify relative path handling 2019-03-23 19:07:01 +01:00
Tim Head 3e1863cd0a Add auto-generated frozen dependency files 2019-03-23 19:07:01 +01:00
Tim Head 4e8b1f9e74 Update default packages 2019-03-23 18:01:16 +01:00
Tim Head 50627eb520 Change path handling in the freeze.py script 2019-03-23 17:46:33 +01:00
Min RK 92239e20c3 make sure we don't touch user $HOME during install-miniconda.bash which is run as root 2019-03-04 22:11:24 +05:30
Tim Head ffed59a56d Add tests for setting Python version during freeze 2019-02-23 15:03:44 +01:00
yuvipanda d8f8c781b2 Bump python default version to 3.7 2019-02-11 12:49:58 -08:00
Tim Head da0eb5826c
Undo conda update 2019-02-10 10:40:38 +01:00
Tim Head 224968c588
Fix path to conda history 2019-02-10 09:53:49 +01:00
Min RK 6e91681def empty conda history instead of deleting it
conda uses the presence of this file as a magic indicator of conda envs
so make it empty, not gone
2019-02-08 12:07:31 +01:00
Min RK 33ae3b00ad There's a miniconda release for 4.5.12 2019-02-08 11:26:44 +01:00
Min RK 597f529ef6 pin conda during Python-switch step
even with auto-update-conda disabled,
switching Python version (which reinstalls conda) can end up upgrading to the latest conda

Avoid this by adding the conda pinning to that install stage
2019-02-08 11:24:35 +01:00
yuvipanda 71ee7db5e0 Bump nteract version to 2.0.0 2019-01-30 10:54:44 -08:00
Min RK b4665f71d4 refreeze with notebook 5.7.4 2018-12-17 16:30:15 +01:00
Tim Head ef7bf9e456 Remove notebook from list of conda packages 2018-12-11 22:39:04 +01:00
Tim Head f3989a6555 Refreeze environments
The frozen Python 3.6 environment was empty so refreezing everything.
Added the generated environment.py-3.6.yml which used to be excluded by
gitignore because it was the only one not also commited to the repo.
2018-12-11 22:32:05 +01:00
Min RK 81f35ba629 remove everything but the comment in unused environment.py-3.5.yml 2018-12-11 11:02:11 +01:00
Min RK 48dcd88365 opt-out of auto-freezing Python 3.5
now that it's not being updated anymore

only security fixes from now on for Python 3.5
2018-12-11 10:54:02 +01:00
Tim Head 9cb2213581 Update notebook to latest release 2018-11-20 07:24:43 +01:00
yuvipanda a62e8acaf4 Add jupyterhub to base environment
Uses pip instead of conda, since (AFAIK) conda installs
CHP and friends too.
2018-11-12 13:19:06 -08:00
Min RK 2e938acf35 refreeze with Python 3.7 2018-09-17 11:03:58 +02:00
Min RK 3f702370ce add Python 3.7 to frozen environment list 2018-09-17 10:29:59 +02:00
Min RK ff91cf9460 pin nbconvert
nbconvert pinning pandoc is having solver consequences of preferring pandoc 2 + nbconvert 5.3 to pandoc 1 + nbconvert 5.4
2018-09-17 10:28:55 +02:00
Min RK 9f2dc015ef bump jupyterlab to 0.34.9
needed for Python 3.7 because 0.34.0 hasn't been packaged for 3.7
2018-09-17 10:28:17 +02:00
yuvipanda 87210dd236 Fail freeze.py if any of the conda steps fail
Currently, this only fails if the last conda command fails,
which is almost never.
2018-09-07 16:01:51 -07:00
yuvipanda f6a7365ed2 Re-run freeze.py to add 3.5 environment.yml file
Previously this had failed.
2018-09-07 16:01:24 -07:00
yuvipanda 7107be75ff Use newer version of conda in freeze.py
This preserves things we install from pip
2018-09-07 09:05:33 -07:00
yuvipanda 759ae84882 Bump nteract-on-jupyter version 2018-09-07 08:46:06 -07:00
yuvipanda 48350eacd4 Bump conda version to 4.5.11 2018-09-06 14:32:43 -07:00
Joseph Hamman 6f60f63ccb compare yaml dict to mapping, not dict 2018-08-19 20:13:10 -07:00
Steven Silvester 4102c0f999 jlab 0.34 compat 2018-08-19 06:24:31 -05:00
Min RK a4ef9b17ae remove conda history file
seems to result in unintended pinning of packages installed when setting up base env
2018-08-07 20:17:49 +02:00
Chris Holdgraf 7552361c2b
Merge pull request #309 from minrk/stencila
stencila support
2018-08-01 08:38:47 -07:00
Min RK cce1a47b09 separate get_build_env from get_env
so that runtime environment variables don’t trigger rebuild
2018-07-20 10:23:53 -07:00
Min RK 710fdcb24e refreeze 2018-07-16 16:30:47 -07:00
Min RK b16eeb8a9e bump versions
notebook 5.6
conda 4.5
jupyterlab 32
nteract 1.8
widgets 7.2
2018-07-16 16:30:39 -07:00
Tim Head ba6aa63085 Switch to miniconda v4.5.1 2018-06-06 19:07:53 +02:00
Gladys Nalvarte 43f367c590 Update the TypeError message and example in the unit test. 2018-06-04 12:56:20 +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
yuvipanda b9f2242876 Bump nteract jupyter extension 2018-05-08 13:32:20 -07:00
Min RK 3b091a5502 fix inverted path
CONDA_DIR should come first, not last
2018-04-16 16:58:01 +02:00
Min RK d6bbed3786 kernel python prefix is always defined, even when it's the same as NB_PYTHON_PREFIX 2018-04-16 10:56:44 +02:00
Min RK b0c67f143c add KERNEL_PYTHON_PREFIX for py2 env
and put it on PATH
2018-04-16 10:42:19 +02:00
Kyle Kelley bd0f31c81c update nteract_on_jupyter to 1.6.0 2018-04-02 01:33:56 -06:00
Min RK eaad02ca34
Merge pull request #274 from willingc/notebook-bump
Refreeze environments
2018-03-20 14:10:36 +01:00
Carol Willing a2ebe316e4 Refreeze environments 2018-03-19 17:57:49 -07:00
Carol Willing 5aaf78a828 add docstrings for conda buildpack 2018-03-19 16:27:00 -07:00
Tim Head ed717955b1 Fix detecting dependency files in binder/ subidr 2018-03-15 16:22:01 +01:00
Min RK abe57f1c00 refreeze environments
- bump ipykernel to 4.8.2
- pin tornado to 4.5.3
2018-03-15 12:54:50 +01:00
Kyle Kelley 3658d7584d upgrade nteract_on_jupyter to 1.5.0 2018-03-07 14:05:40 -08:00
Min RK bc0b32bd1e remove -v from conda env update
there is so much verbose output that it seems to make it even harder to see what's happening,
except in very particular

while it's useful for debugging purposes when things like post-link fail,
I don't think we should do it by default.

added a `conda list` at the end to see what's been installed
2018-02-28 14:49:19 +01:00
Chris Holdgraf 98483d2c8e bumping ipywidgets version 2018-02-14 08:56:42 -08:00
Tim Head a50f061a1f Bump jupyterlab and jupyter notebook to latest versions 2018-02-08 10:27:15 +01:00
Yuvi Panda a856b359fe
Merge pull request #219 from rgbkrk/bump-nteract-on-jupyter
pin nteract_on_jupyter to 1.4.0
2018-02-06 17:32:12 -08:00
Kyle Kelley eae15ee481 Switch freeze guidance to not be a directive 2018-02-06 16:54:50 -08:00
Kyle Kelley 2b3e3d39dc pin nteract_on_jupyter to 1.4.0 2018-02-06 16:47:18 -08:00
Min RK 740cd35807 upgrade env in two steps
upgrade Python on its own because `conda env update` can get sad when upgrading Python along with a bunch of other transactions (specifically pip-install)
2018-02-02 15:28:27 +01:00
Min RK 8898b6635c refreeze conda environments
with nteract-on-jupyter via pip
2018-02-02 15:28:27 +01:00
Min RK 0d1c132de2 support freezing one Python at a time 2018-02-02 15:28:27 +01:00
Min RK c31ff40937 avoid pip cache in install-miniconda 2018-02-02 15:28:27 +01:00
Min RK e9a3a94ca1 add nteract_on_jupyter via pip in conda 2018-02-02 15:28:27 +01:00
Min RK 6dccbbe68b update conda used for freezing and remove workaround for conda-export bug
Bug is fixed in conda 4.4
2018-02-02 15:28:27 +01:00
Min RK 26dac5cc9b
Merge pull request #207 from yuvipanda/inheritance
Use inheritance to define composed buildpacks
2018-02-02 09:36:38 +01:00
Min RK 40417b6a7f conda: fix Python version detection
detecting Python 3.5 wasn't happening properly
2018-02-01 17:39:49 +01:00
yuvipanda be10cadbcb Remove traitlet imports from all buildpacks 2018-02-01 04:23:34 -08:00
yuvipanda 4d19924180 Use inheritance to define composed buildpacks
- This is much cleaner to understand than traitlets
- Remove 'name' and 'component' traitlets
2018-02-01 04:23:34 -08:00
yuvipanda e913fce474 Cache python_version detection in conda buildpack 2018-02-01 02:42:17 -08:00
yuvipanda 95c0170196 Be less clever in figuring out python version in conda
We can optimize this later
2018-02-01 02:10:59 -08:00
yuvipanda 66ec915a23 Fix python version detection in conda 2018-02-01 01:52:36 -08:00
yuvipanda 28bccecfff Switch assemble_scripts to use methods instead of traitlets 2018-02-01 01:43:14 -08:00
yuvipanda 42eb8e573c Convert build_script & build_script files to methods 2018-02-01 01:39:36 -08:00
yuvipanda d3c6703e9e Move path and env from traitlets to methods 2018-02-01 01:21:17 -08:00
yuvipanda 9fa8f21668 Refreeze conda environment
This broke out of the blue, causing CI to fail - see
https://github.com/jupyter/repo2docker/pull/180#issuecomment-356805582
2018-01-10 23:52:16 -08:00
Min RK 58ce29f61d allow installing 'broken' packages for frozen env
If a package we froze is later marked as broken, don't prevent installation.

Broken packages are lowest priority, so only allowed for those pinned in our frozen env
2018-01-08 17:08:13 +01:00
Min RK c2ae937b61 refreeze conda environments
gets a few updates, but fixes issue with noarch wheel package that has been identified as broken.
2018-01-08 14:48:41 +01:00
Min RK 997009133d [conda] install python 2 in separate kernel env 2018-01-03 18:17:33 +01:00
Min RK 878fc33f1d select frozen env based on Python found in environment.yml
if env specifies a version of Python other than the default,
a different base env will be selected.

This should fix some issues where switching Python versions on the base env with a bunch of packages installed can fail,
and will always produce a huge amount of churn.

Future change:

- place py2 in a separate env, like we do for requirements.txt
2018-01-03 17:14:03 +01:00
Min RK 5984a08e66 [conda] create separate frozen envs for Python versions
this will allow us to create different base envs based on Python major.minor versions
2018-01-03 16:38:19 +01:00
yuvipanda f5ca9aedb0 Upgrade base packages
- Bump JupyterLab to latest
- Run freeze.py (conda) and freeze.bash (venv) to get new dependent
  packages, primarily newer ipykernel and ipywidgets
- Remove some over-specification in environment.yml
2017-12-16 14:13:40 -08:00
Min RK 844023c96f update conda to 4.3.30 2017-12-07 10:13:20 +01:00
Min RK 4688dcc0ae freeze conda environment.yml as well
like python, run freeze in a docker container for portability
2017-12-04 17:34:43 +01:00
Min RK bd3bf07ebe sync conda versions with venv versions 2017-11-30 13:17:12 +01:00
yuvipanda c43d45ce21 Move conda support files next to the code
Better than in a separate files dir IMO
2017-11-30 01:44:25 -08:00