Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refreeze with notebook 5.7.4 #519

Merged
merged 1 commit into from
Dec 18, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 7 additions & 7 deletions repo2docker/buildpacks/conda/environment.frozen.yml
@@ -1,5 +1,5 @@
# AUTO GENERATED FROM environment.py-3.6.yml, DO NOT MANUALLY MODIFY
# Frozen on 2018-12-11 21:19:13 UTC
# Frozen on 2018-12-17 15:24:58 UTC
name: r2d
channels:
- conda-forge
Expand All @@ -8,7 +8,7 @@ channels:
dependencies:
- attrs=18.2.0=py_0
- backcall=0.1.0=py_0
- bleach=3.0.2=py_0
- bleach=3.0.2=py_1
- ca-certificates=2018.11.29=ha4d7672_0
- certifi=2018.11.29=py36_1000
- decorator=4.3.0=py_0
Expand All @@ -19,7 +19,7 @@ dependencies:
- ipython=7.2.0=py36h24bf2e0_1000
- ipython_genutils=0.2.0=py_1
- ipywidgets=7.2.1=py36_1
- jedi=0.13.1=py36_1000
- jedi=0.13.2=py36_1000
- jinja2=2.10=py_1
- jsonschema=3.0.0a3=py36_1000
- jupyter_client=5.2.4=py_0
Expand All @@ -35,7 +35,7 @@ dependencies:
- nbconvert=5.4.0=1
- nbformat=4.4.0=py_1
- ncurses=6.1=hfc679d8_2
- notebook=5.7.2=py36_1000
- notebook=5.7.4=py36_1000
- openssl=1.0.2p=h470a237_1
- pandoc=1.19.2=0
- pandocfilters=1.4.2=py_1
Expand All @@ -46,14 +46,14 @@ dependencies:
- prometheus_client=0.5.0=py_0
- prompt_toolkit=2.0.7=py_0
- ptyprocess=0.6.0=py36_1000
- pygments=2.3.0=py_0
- pygments=2.3.1=py_0
- pyrsistent=0.14.7=py36h470a237_0
- python=3.6.7=h5001a0f_1
- python-dateutil=2.7.5=py_0
- pyzmq=17.1.2=py36hae99301_1
- readline=7.0=haf1bffa_1
- send2trash=1.5.0=py_0
- setuptools=40.6.2=py36_0
- setuptools=40.6.3=py36_0
- six=1.12.0=py36_1000
- sqlite=3.26.0=hb1c47c0_0
- terminado=0.8.1=py36_1001
Expand All @@ -80,7 +80,7 @@ dependencies:
- python-editor==1.0.3
- python-oauth2==1.1.0
- requests==2.21.0
- sqlalchemy==1.2.14
- sqlalchemy==1.2.15
- urllib3==1.24.1
prefix: /opt/conda/envs/r2d

6 changes: 3 additions & 3 deletions repo2docker/buildpacks/conda/environment.py-2.7.frozen.yml
@@ -1,5 +1,5 @@
# AUTO GENERATED FROM environment.py-2.7.yml, DO NOT MANUALLY MODIFY
# Frozen on 2018-12-11 21:15:11 UTC
# Frozen on 2018-12-17 15:21:41 UTC
name: r2d
channels:
- conda-forge
Expand Down Expand Up @@ -31,13 +31,13 @@ dependencies:
- pip=18.1=py27_1000
- prompt_toolkit=1.0.15=py_1
- ptyprocess=0.6.0=py27_1000
- pygments=2.3.0=py_0
- pygments=2.3.1=py_0
- python=2.7.15=h33da82c_6
- python-dateutil=2.7.5=py_0
- pyzmq=17.1.2=py27hae99301_1
- readline=7.0=haf1bffa_1
- scandir=1.9.0=py27h470a237_0
- setuptools=40.6.2=py27_0
- setuptools=40.6.3=py27_0
- simplegeneric=0.8.1=py_1
- singledispatch=3.4.0.3=py27_1000
- six=1.12.0=py27_1000
Expand Down
2 changes: 1 addition & 1 deletion repo2docker/buildpacks/conda/environment.py-3.5.frozen.yml
Expand Up @@ -75,7 +75,7 @@ dependencies:
- idna==2.7
- jupyterhub==0.9.4
- mako==1.0.7
- notebook==5.7.2
- notebook==5.7.4
- nteract-on-jupyter==1.9.6
- pamela==0.3.0
- python-editor==1.0.3
Expand Down
14 changes: 7 additions & 7 deletions repo2docker/buildpacks/conda/environment.py-3.6.frozen.yml
@@ -1,5 +1,5 @@
# AUTO GENERATED FROM environment.py-3.6.yml, DO NOT MANUALLY MODIFY
# Frozen on 2018-12-11 21:19:13 UTC
# Frozen on 2018-12-17 15:24:58 UTC
name: r2d
channels:
- conda-forge
Expand All @@ -8,7 +8,7 @@ channels:
dependencies:
- attrs=18.2.0=py_0
- backcall=0.1.0=py_0
- bleach=3.0.2=py_0
- bleach=3.0.2=py_1
- ca-certificates=2018.11.29=ha4d7672_0
- certifi=2018.11.29=py36_1000
- decorator=4.3.0=py_0
Expand All @@ -19,7 +19,7 @@ dependencies:
- ipython=7.2.0=py36h24bf2e0_1000
- ipython_genutils=0.2.0=py_1
- ipywidgets=7.2.1=py36_1
- jedi=0.13.1=py36_1000
- jedi=0.13.2=py36_1000
- jinja2=2.10=py_1
- jsonschema=3.0.0a3=py36_1000
- jupyter_client=5.2.4=py_0
Expand All @@ -35,7 +35,7 @@ dependencies:
- nbconvert=5.4.0=1
- nbformat=4.4.0=py_1
- ncurses=6.1=hfc679d8_2
- notebook=5.7.2=py36_1000
- notebook=5.7.4=py36_1000
- openssl=1.0.2p=h470a237_1
- pandoc=1.19.2=0
- pandocfilters=1.4.2=py_1
Expand All @@ -46,14 +46,14 @@ dependencies:
- prometheus_client=0.5.0=py_0
- prompt_toolkit=2.0.7=py_0
- ptyprocess=0.6.0=py36_1000
- pygments=2.3.0=py_0
- pygments=2.3.1=py_0
- pyrsistent=0.14.7=py36h470a237_0
- python=3.6.7=h5001a0f_1
- python-dateutil=2.7.5=py_0
- pyzmq=17.1.2=py36hae99301_1
- readline=7.0=haf1bffa_1
- send2trash=1.5.0=py_0
- setuptools=40.6.2=py36_0
- setuptools=40.6.3=py36_0
- six=1.12.0=py36_1000
- sqlite=3.26.0=hb1c47c0_0
- terminado=0.8.1=py36_1001
Expand All @@ -80,7 +80,7 @@ dependencies:
- python-editor==1.0.3
- python-oauth2==1.1.0
- requests==2.21.0
- sqlalchemy==1.2.14
- sqlalchemy==1.2.15
- urllib3==1.24.1
prefix: /opt/conda/envs/r2d

4 changes: 2 additions & 2 deletions repo2docker/buildpacks/conda/environment.py-3.6.yml
@@ -1,11 +1,11 @@
# AUTO GENERATED FROM environment.yml, DO NOT MANUALLY MODIFY
# Generated on 2018-12-11 21:19:13 UTC
# Generated on 2018-12-17 15:24:58 UTC
dependencies:
- python=3.6.*
- ipywidgets==7.2.1
- jupyterlab==0.34.9
- nbconvert==5.4.0
- notebook==5.7.2
- notebook==5.7.4
- pip:
- nteract_on_jupyter==1.9.6
- jupyterhub==0.9.4
14 changes: 7 additions & 7 deletions repo2docker/buildpacks/conda/environment.py-3.7.frozen.yml
@@ -1,5 +1,5 @@
# AUTO GENERATED FROM environment.py-3.7.yml, DO NOT MANUALLY MODIFY
# Frozen on 2018-12-11 21:16:37 UTC
# Frozen on 2018-12-17 15:22:44 UTC
name: r2d
channels:
- conda-forge
Expand All @@ -8,7 +8,7 @@ channels:
dependencies:
- attrs=18.2.0=py_0
- backcall=0.1.0=py_0
- bleach=3.0.2=py_0
- bleach=3.0.2=py_1
- bzip2=1.0.6=h470a237_2
- ca-certificates=2018.11.29=ha4d7672_0
- certifi=2018.11.29=py37_1000
Expand All @@ -19,7 +19,7 @@ dependencies:
- ipykernel=5.1.0=py37h24bf2e0_1001
- ipython=7.2.0=py37h24bf2e0_1000
- ipython_genutils=0.2.0=py_1
- jedi=0.13.1=py37_1000
- jedi=0.13.2=py37_1000
- jinja2=2.10=py_1
- jsonschema=3.0.0a3=py37_1000
- jupyter_client=5.2.4=py_0
Expand All @@ -34,7 +34,7 @@ dependencies:
- nbconvert=5.4.0=1
- nbformat=4.4.0=py_1
- ncurses=6.1=hfc679d8_2
- notebook=5.7.2=py37_1000
- notebook=5.7.4=py37_1000
- openssl=1.0.2p=h470a237_1
- pandoc=1.19.2=0
- pandocfilters=1.4.2=py_1
Expand All @@ -45,14 +45,14 @@ dependencies:
- prometheus_client=0.5.0=py_0
- prompt_toolkit=2.0.7=py_0
- ptyprocess=0.6.0=py37_1000
- pygments=2.3.0=py_0
- pygments=2.3.1=py_0
- pyrsistent=0.14.7=py37h470a237_0
- python=3.7.1=h5001a0f_0
- python-dateutil=2.7.5=py_0
- pyzmq=17.1.2=py37hae99301_1
- readline=7.0=haf1bffa_1
- send2trash=1.5.0=py_0
- setuptools=40.6.2=py37_0
- setuptools=40.6.3=py37_0
- six=1.12.0=py37_1000
- sqlite=3.26.0=hb1c47c0_0
- terminado=0.8.1=py37_1001
Expand Down Expand Up @@ -81,7 +81,7 @@ dependencies:
- python-editor==1.0.3
- python-oauth2==1.1.0
- requests==2.21.0
- sqlalchemy==1.2.14
- sqlalchemy==1.2.15
- urllib3==1.24.1
prefix: /opt/conda/envs/r2d

4 changes: 2 additions & 2 deletions repo2docker/buildpacks/conda/environment.py-3.7.yml
@@ -1,11 +1,11 @@
# AUTO GENERATED FROM environment.yml, DO NOT MANUALLY MODIFY
# Generated on 2018-12-11 21:16:37 UTC
# Generated on 2018-12-17 15:22:44 UTC
dependencies:
- python=3.7.*
- ipywidgets==7.2.1
- jupyterlab==0.34.9
- nbconvert==5.4.0
- notebook==5.7.2
- notebook==5.7.4
- pip:
- nteract_on_jupyter==1.9.6
- jupyterhub==0.9.4
2 changes: 1 addition & 1 deletion repo2docker/buildpacks/conda/environment.yml
Expand Up @@ -3,7 +3,7 @@ dependencies:
- ipywidgets==7.2.1
- jupyterlab==0.34.9
- nbconvert==5.4.0
- notebook==5.7.2
- notebook==5.7.4
- pip:
- nteract_on_jupyter==1.9.6
- jupyterhub==0.9.4
2 changes: 1 addition & 1 deletion repo2docker/buildpacks/conda/freeze.py
Expand Up @@ -21,7 +21,7 @@

# Docker image version can be different than conda version,
# since miniconda3 docker images seem to lag conda releases.
MINICONDA_DOCKER_VERSION = '4.5.4'
MINICONDA_DOCKER_VERSION = '4.5.11'
CONDA_VERSION = '4.5.11'

HERE = pathlib.Path(os.path.dirname(os.path.abspath(__file__)))
Expand Down