From f5ca9aedb06a72c9ed6702f3dd321bf310dc6a38 Mon Sep 17 00:00:00 2001 From: yuvipanda Date: Sat, 16 Dec 2017 14:13:40 -0800 Subject: [PATCH] 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 --- .../buildpacks/conda/environment.frozen.yml | 16 +++++++-------- repo2docker/buildpacks/conda/environment.yml | 4 +--- .../buildpacks/python/requirements.frozen.txt | 20 +++++++++---------- .../buildpacks/python/requirements.txt | 2 +- .../python/requirements2.frozen.txt | 4 ++-- 5 files changed, 22 insertions(+), 24 deletions(-) diff --git a/repo2docker/buildpacks/conda/environment.frozen.yml b/repo2docker/buildpacks/conda/environment.frozen.yml index 78cc21f39..f63b4f0f5 100644 --- a/repo2docker/buildpacks/conda/environment.frozen.yml +++ b/repo2docker/buildpacks/conda/environment.frozen.yml @@ -9,8 +9,8 @@ dependencies: - decorator=4.1.2=py36_0 - entrypoints=0.2.3=py36_1 - gmp=6.1.2=0 -- html5lib=0.999999999=py36_0 -- ipykernel=4.6.1=py36_0 +- html5lib=1.0.1=py_0 +- ipykernel=4.7.0=py36_0 - ipython=6.2.1=py36_0 - ipython_genutils=0.2.0=py36_0 - ipywidgets=6.0.1=py36_0 @@ -19,17 +19,17 @@ dependencies: - jsonschema=2.6.0=py36_0 - jupyter_client=5.1.0=py36_0 - jupyter_core=4.4.0=py_0 -- jupyterlab=0.29.2=py36_0 -- jupyterlab_launcher=0.5.5=py36_0 +- jupyterlab=0.30.6=py36_0 +- jupyterlab_launcher=0.6.0=py36_0 - libsodium=1.0.15=1 - markupsafe=1.0=py36_0 -- mistune=0.8=py36_0 +- mistune=0.8.3=py_0 - nbconvert=5.3.1=py_1 - nbformat=4.4.0=py36_0 - ncurses=5.9=10 - notebook=5.2.2=py36_1 -- openssl=1.0.2m=0 -- pandoc=2.0.4=0 +- openssl=1.0.2n=0 +- pandoc=2.0.5=0 - pandocfilters=1.4.1=py36_0 - pexpect=4.3.0=py36_0 - pickleshare=0.7.4=py36_0 @@ -41,7 +41,7 @@ dependencies: - python-dateutil=2.6.1=py36_0 - pyzmq=16.0.2=py36_2 - readline=6.2=0 -- setuptools=38.2.3=py36_0 +- setuptools=38.2.4=py36_0 - simplegeneric=0.8.1=py36_0 - six=1.11.0=py36_1 - sqlite=3.13.0=1 diff --git a/repo2docker/buildpacks/conda/environment.yml b/repo2docker/buildpacks/conda/environment.yml index fa6459a81..fec62aa05 100644 --- a/repo2docker/buildpacks/conda/environment.yml +++ b/repo2docker/buildpacks/conda/environment.yml @@ -1,7 +1,5 @@ dependencies: - python==3.6.1 - - ipython==6.2.1 - - ipykernel==4.6.1 - ipywidgets==6.0.1 - - jupyterlab==0.29.2 + - jupyterlab==0.30.6 - notebook==5.2.2 diff --git a/repo2docker/buildpacks/python/requirements.frozen.txt b/repo2docker/buildpacks/python/requirements.frozen.txt index 90514ed5d..7e236a8bd 100644 --- a/repo2docker/buildpacks/python/requirements.frozen.txt +++ b/repo2docker/buildpacks/python/requirements.frozen.txt @@ -1,28 +1,28 @@ # AUTO GENERATED FROM requirements.txt, DO NOT MANUALLY MODIFY -# Frozen on Thu Nov 30 12:03:22 UTC 2017 -bleach==2.1.1 +# Frozen on Sat Dec 16 22:12:51 UTC 2017 +bleach==2.1.2 decorator==4.1.2 entrypoints==0.2.3 -html5lib==1.0b10 -ipykernel==4.6.1 +html5lib==1.0.1 +ipykernel==4.7.0 ipython-genutils==0.2.0 ipython==6.2.1 ipywidgets==6.0.1 -jedi==0.11.0 +jedi==0.11.1 Jinja2==2.10 jsonschema==2.6.0 jupyter-client==5.1.0 jupyter-core==4.4.0 -jupyterlab-launcher==0.5.5 -jupyterlab==0.29.2 +jupyterlab-launcher==0.6.0 +jupyterlab==0.30.6 MarkupSafe==1.0 -mistune==0.8.1 +mistune==0.8.3 nbconvert==5.3.1 nbformat==4.4.0 notebook==5.2.2 pandocfilters==1.4.2 -parso==0.1.0 -pexpect==4.3.0 +parso==0.1.1 +pexpect==4.3.1 pickleshare==0.7.4 prompt-toolkit==1.0.15 ptyprocess==0.5.2 diff --git a/repo2docker/buildpacks/python/requirements.txt b/repo2docker/buildpacks/python/requirements.txt index 8885ac331..044be386a 100644 --- a/repo2docker/buildpacks/python/requirements.txt +++ b/repo2docker/buildpacks/python/requirements.txt @@ -1,3 +1,3 @@ notebook==5.2.2 ipywidgets==6.0.1 -jupyterlab==0.29.2 +jupyterlab==0.30.6 diff --git a/repo2docker/buildpacks/python/requirements2.frozen.txt b/repo2docker/buildpacks/python/requirements2.frozen.txt index dd5d7d1d9..fe8385bf0 100644 --- a/repo2docker/buildpacks/python/requirements2.frozen.txt +++ b/repo2docker/buildpacks/python/requirements2.frozen.txt @@ -1,5 +1,5 @@ # AUTO GENERATED FROM requirements2.txt, DO NOT MANUALLY MODIFY -# Frozen on Thu Nov 30 12:03:43 UTC 2017 +# Frozen on Sat Dec 16 22:13:15 UTC 2017 backports-abc==0.5 backports.shutil-get-terminal-size==1.0.0 certifi==2017.11.5 @@ -11,7 +11,7 @@ ipython==5.5.0 jupyter-client==5.1.0 jupyter-core==4.4.0 pathlib2==2.3.0 -pexpect==4.3.0 +pexpect==4.3.1 pickleshare==0.7.4 prompt-toolkit==1.0.15 ptyprocess==0.5.2