Skip to content

Commit ccce3fe

Browse files
authored
Merge pull request #467 from yuvipanda/jupyterhub
Add jupyterhub to base environment
2 parents 0b7adee + a62e8ac commit ccce3fe

File tree

7 files changed

+193
-146
lines changed

7 files changed

+193
-146
lines changed
Lines changed: 45 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,27 @@
11
# AUTO GENERATED FROM environment.py-3.6.yml, DO NOT MANUALLY MODIFY
2-
# Frozen on 2018-09-17 08:36:41 UTC
2+
# Frozen on 2018-11-12 20:48:01 UTC
33
name: r2d
44
channels:
55
- conda-forge
66
- defaults
77
- conda-forge/label/broken
88
dependencies:
9+
- attrs=18.2.0=py_0
910
- backcall=0.1.0=py_0
10-
- bleach=2.1.4=py_1
11-
- bzip2=1.0.6=h470a237_2
12-
- ca-certificates=2018.8.24=ha4d7672_0
13-
- certifi=2018.8.24=py36_1
11+
- bleach=3.0.2=py_0
12+
- ca-certificates=2018.10.15=ha4d7672_0
13+
- certifi=2018.10.15=py36_1000
1414
- decorator=4.3.0=py_0
15-
- defusedxml=0.5.0=py36_0
16-
- entrypoints=0.2.3=py36_2
15+
- defusedxml=0.5.0=py_1
16+
- entrypoints=0.2.3=py36_1002
1717
- gmp=6.1.2=hfc679d8_0
18-
- html5lib=1.0.1=py_0
19-
- ipykernel=4.9.0=py36_0
20-
- ipython=6.5.0=py36_0
18+
- ipykernel=5.1.0=py36h24bf2e0_1001
19+
- ipython=7.1.1=py36h24bf2e0_1000
2120
- ipython_genutils=0.2.0=py_1
2221
- ipywidgets=7.2.1=py36_1
23-
- jedi=0.12.1=py36_0
22+
- jedi=0.13.1=py36_1000
2423
- jinja2=2.10=py_1
25-
- jsonschema=2.6.0=py36_2
24+
- jsonschema=3.0.0a3=py36_1000
2625
- jupyter_client=5.2.3=py_1
2726
- jupyter_core=4.4.0=py_0
2827
- jupyterlab=0.34.9=py36_0
@@ -31,45 +30,57 @@ dependencies:
3130
- libgcc-ng=7.2.0=hdf63c60_3
3231
- libsodium=1.0.16=h470a237_1
3332
- libstdcxx-ng=7.2.0=hdf63c60_3
34-
- markupsafe=1.0=py36h470a237_1
35-
- mistune=0.8.3=py36h470a237_2
33+
- markupsafe=1.1.0=py36h470a237_0
34+
- mistune=0.8.4=py36h470a237_0
3635
- nbconvert=5.4.0=1
3736
- nbformat=4.4.0=py_1
3837
- ncurses=6.1=hfc679d8_1
3938
- notebook=5.6.0=py36_1
40-
- openssl=1.0.2p=h470a237_0
39+
- openssl=1.0.2p=h470a237_1
4140
- pandoc=1.19.2=0
4241
- pandocfilters=1.4.2=py_1
4342
- parso=0.3.1=py_0
44-
- pexpect=4.6.0=py36_0
45-
- pickleshare=0.7.4=py36_0
46-
- pip=18.0=py36_1
47-
- prometheus_client=0.3.1=py_1
48-
- prompt_toolkit=1.0.15=py_1
49-
- ptyprocess=0.6.0=py36_0
43+
- pexpect=4.6.0=py36_1000
44+
- pickleshare=0.7.5=py36_1000
45+
- pip=18.1=py36_1000
46+
- prometheus_client=0.4.2=py_0
47+
- prompt_toolkit=2.0.7=py_0
48+
- ptyprocess=0.6.0=py36_1000
5049
- pygments=2.2.0=py_1
51-
- python=3.6.6=h5001a0f_0
52-
- python-dateutil=2.7.3=py_0
53-
- pyzmq=17.1.2=py36hae99301_0
50+
- pyrsistent=0.14.5=py36h470a237_1
51+
- python=3.6.6=h5001a0f_3
52+
- python-dateutil=2.7.5=py_0
53+
- pyzmq=17.1.2=py36hae99301_1
5454
- readline=7.0=haf1bffa_1
5555
- send2trash=1.5.0=py_0
56-
- setuptools=40.2.0=py36_0
57-
- simplegeneric=0.8.1=py_1
58-
- six=1.11.0=py36_1
59-
- sqlite=3.24.0=h2f33b56_1
60-
- terminado=0.8.1=py36_1
61-
- testpath=0.3.1=py36_1
62-
- tk=8.6.8=0
56+
- setuptools=40.5.0=py36_0
57+
- six=1.11.0=py36_1001
58+
- sqlite=3.25.3=hb1c47c0_0
59+
- terminado=0.8.1=py36_1001
60+
- testpath=0.4.2=py36_1000
61+
- tk=8.6.8=ha92aebf_0
6362
- tornado=4.5.3=py36_0
64-
- traitlets=4.3.2=py36_0
63+
- traitlets=4.3.2=py36_1000
6564
- wcwidth=0.1.7=py_1
6665
- webencodings=0.5.1=py_1
67-
- wheel=0.31.1=py36_1
66+
- wheel=0.32.2=py36_0
6867
- widgetsnbextension=3.2.1=py36_1
6968
- xz=5.2.4=h470a237_1
70-
- zeromq=4.2.5=hfc679d8_5
69+
- zeromq=4.2.5=hfc679d8_6
7170
- zlib=1.2.11=h470a237_3
7271
- pip:
72+
- alembic==1.0.2
73+
- async-generator==1.10
74+
- chardet==3.0.4
75+
- idna==2.7
76+
- jupyterhub==0.9.4
77+
- mako==1.0.7
7378
- nteract-on-jupyter==1.9.6
79+
- pamela==0.3.0
80+
- python-editor==1.0.3
81+
- python-oauth2==1.1.0
82+
- requests==2.20.1
83+
- sqlalchemy==1.2.14
84+
- urllib3==1.24.1
7485
prefix: /opt/conda/envs/r2d
7586

repo2docker/buildpacks/conda/environment.py-2.7.frozen.yml

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# AUTO GENERATED FROM environment.py-2.7.yml, DO NOT MANUALLY MODIFY
2-
# Frozen on 2018-09-17 08:27:26 UTC
2+
# Frozen on 2018-11-12 20:35:26 UTC
33
name: r2d
44
channels:
55
- conda-forge
@@ -9,45 +9,45 @@ dependencies:
99
- backports=1.0=py_2
1010
- backports.shutil_get_terminal_size=1.0.0=py_3
1111
- backports_abc=0.5=py_1
12-
- bzip2=1.0.6=h470a237_2
13-
- ca-certificates=2018.8.24=ha4d7672_0
14-
- certifi=2018.8.24=py27_1
12+
- ca-certificates=2018.10.15=ha4d7672_0
13+
- certifi=2018.10.15=py27_1000
1514
- decorator=4.3.0=py_0
16-
- enum34=1.1.6=py27_1
15+
- enum34=1.1.6=py27_1001
1716
- ipykernel=4.8.2=py27_0
1817
- ipython=5.8.0=py27_0
1918
- ipython_genutils=0.2.0=py_1
2019
- jupyter_client=5.2.3=py_1
2120
- jupyter_core=4.4.0=py_0
21+
- libffi=3.2.1=hfc679d8_5
2222
- libgcc-ng=7.2.0=hdf63c60_3
2323
- libsodium=1.0.16=h470a237_1
2424
- libstdcxx-ng=7.2.0=hdf63c60_3
2525
- ncurses=6.1=hfc679d8_1
26-
- openssl=1.0.2p=h470a237_0
27-
- pathlib2=2.3.2=py27_0
28-
- pexpect=4.6.0=py27_0
29-
- pickleshare=0.7.4=py27_0
30-
- pip=18.0=py27_1
26+
- openssl=1.0.2p=h470a237_1
27+
- pathlib2=2.3.2=py27_1000
28+
- pexpect=4.6.0=py27_1000
29+
- pickleshare=0.7.5=py27_1000
30+
- pip=18.1=py27_1000
3131
- prompt_toolkit=1.0.15=py_1
32-
- ptyprocess=0.6.0=py27_0
32+
- ptyprocess=0.6.0=py27_1000
3333
- pygments=2.2.0=py_1
34-
- python=2.7.15=h9fef7bc_0
35-
- python-dateutil=2.7.3=py_0
36-
- pyzmq=17.1.2=py27hae99301_0
34+
- python=2.7.15=h33da82c_4
35+
- python-dateutil=2.7.5=py_0
36+
- pyzmq=17.1.2=py27hae99301_1
3737
- readline=7.0=haf1bffa_1
3838
- scandir=1.9.0=py27h470a237_0
39-
- setuptools=40.2.0=py27_0
39+
- setuptools=40.5.0=py27_0
4040
- simplegeneric=0.8.1=py_1
41-
- singledispatch=3.4.0.3=py27_0
42-
- six=1.11.0=py27_1
43-
- sqlite=3.24.0=h2f33b56_1
44-
- ssl_match_hostname=3.5.0.1=py27_1
45-
- tk=8.6.8=0
41+
- singledispatch=3.4.0.3=py27_1000
42+
- six=1.11.0=py27_1001
43+
- sqlite=3.25.3=hb1c47c0_0
44+
- ssl_match_hostname=3.5.0.1=py27_1001
45+
- tk=8.6.8=ha92aebf_0
4646
- tornado=4.5.3=py27_0
47-
- traitlets=4.3.2=py27_0
47+
- traitlets=4.3.2=py27_1000
4848
- wcwidth=0.1.7=py_1
49-
- wheel=0.31.1=py27_1
50-
- zeromq=4.2.5=hfc679d8_5
49+
- wheel=0.32.2=py27_0
50+
- zeromq=4.2.5=hfc679d8_6
5151
- zlib=1.2.11=h470a237_3
5252
- pip:
5353
- backports.ssl-match-hostname==3.5.0.1
Lines changed: 31 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
11
# AUTO GENERATED FROM environment.py-3.5.yml, DO NOT MANUALLY MODIFY
2-
# Frozen on 2018-09-17 08:33:33 UTC
2+
# Frozen on 2018-11-12 20:43:21 UTC
33
name: r2d
44
channels:
55
- conda-forge
66
- defaults
77
- conda-forge/label/broken
88
dependencies:
99
- backcall=0.1.0=py_0
10-
- bleach=2.1.4=py_1
10+
- bleach=3.0.2=py_0
1111
- bzip2=1.0.6=h470a237_2
12-
- ca-certificates=2018.8.24=ha4d7672_0
13-
- certifi=2018.8.24=py35_1
12+
- ca-certificates=2018.10.15=ha4d7672_0
13+
- certifi=2018.8.24=py35_1001
1414
- decorator=4.3.0=py_0
15-
- defusedxml=0.5.0=py35_0
15+
- defusedxml=0.5.0=py_1
1616
- entrypoints=0.2.3=py35_2
1717
- gmp=6.1.2=hfc679d8_0
18-
- html5lib=1.0.1=py_0
19-
- ipykernel=4.9.0=py35_0
20-
- ipython=6.5.0=py35_0
18+
- ipykernel=5.1.0=pyh24bf2e0_0
19+
- ipython=7.0.1=py35h24bf2e0_0
2120
- ipython_genutils=0.2.0=py_1
2221
- ipywidgets=7.2.1=py35_1
2322
- jedi=0.12.1=py35_0
@@ -37,39 +36,51 @@ dependencies:
3736
- nbformat=4.4.0=py_1
3837
- ncurses=6.1=hfc679d8_1
3938
- notebook=5.6.0=py35_1
40-
- openssl=1.0.2p=h470a237_0
39+
- openssl=1.0.2p=h470a237_1
4140
- pandoc=1.19.2=0
4241
- pandocfilters=1.4.2=py_1
4342
- parso=0.3.1=py_0
4443
- pexpect=4.6.0=py35_0
45-
- pickleshare=0.7.4=py35_0
46-
- pip=18.0=py35_1
47-
- prometheus_client=0.3.1=py_1
48-
- prompt_toolkit=1.0.15=py_1
49-
- ptyprocess=0.6.0=py35_0
44+
- pickleshare=0.7.5=py35_0
45+
- pip=18.0=py35_1001
46+
- prometheus_client=0.4.2=py_0
47+
- prompt_toolkit=2.0.7=py_0
48+
- ptyprocess=0.6.0=py35_1000
5049
- pygments=2.2.0=py_1
5150
- python=3.5.5=h5001a0f_2
52-
- python-dateutil=2.7.3=py_0
51+
- python-dateutil=2.7.5=py_0
5352
- pyzmq=17.1.2=py35hae99301_0
5453
- readline=7.0=haf1bffa_1
5554
- send2trash=1.5.0=py_0
56-
- setuptools=40.2.0=py35_0
55+
- setuptools=40.4.3=py35_0
5756
- simplegeneric=0.8.1=py_1
5857
- six=1.11.0=py35_1
59-
- sqlite=3.24.0=h2f33b56_1
58+
- sqlite=3.25.3=hb1c47c0_0
6059
- terminado=0.8.1=py35_1
6160
- testpath=0.3.1=py35_1
62-
- tk=8.6.8=0
61+
- tk=8.6.8=ha92aebf_0
6362
- tornado=4.5.3=py35_0
6463
- traitlets=4.3.2=py35_0
6564
- wcwidth=0.1.7=py_1
6665
- webencodings=0.5.1=py_1
67-
- wheel=0.31.1=py35_1
66+
- wheel=0.32.0=py35_1000
6867
- widgetsnbextension=3.2.1=py35_1
6968
- xz=5.2.4=h470a237_1
70-
- zeromq=4.2.5=hfc679d8_5
69+
- zeromq=4.2.5=hfc679d8_6
7170
- zlib=1.2.11=h470a237_3
7271
- pip:
72+
- alembic==1.0.2
73+
- async-generator==1.10
74+
- chardet==3.0.4
75+
- idna==2.7
76+
- jupyterhub==0.9.4
77+
- mako==1.0.7
7378
- nteract-on-jupyter==1.9.6
79+
- pamela==0.3.0
80+
- python-editor==1.0.3
81+
- python-oauth2==1.1.0
82+
- requests==2.20.1
83+
- sqlalchemy==1.2.14
84+
- urllib3==1.24.1
7485
prefix: /opt/conda/envs/r2d
7586

0 commit comments

Comments
 (0)