Skip to content

Commit d24d7e4

Browse files
authored
Merge pull request #1017 from minrk/39
freeze with mamba, add 3.9
2 parents b6e451d + b73c96e commit d24d7e4

12 files changed

+282
-123
lines changed

repo2docker/buildpacks/conda/environment.frozen.yml

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# AUTO GENERATED FROM environment.py-3.7.yml, DO NOT MANUALLY MODIFY
2-
# Frozen on 2021-02-16 14:46:08 UTC
2+
# Frozen on 2021-02-22 12:26:46 UTC
33
name: r2d
44
channels:
55
- conda-forge
@@ -8,9 +8,9 @@ channels:
88
dependencies:
99
- _libgcc_mutex=0.1=conda_forge
1010
- _openmp_mutex=4.5=1_gnu
11-
- alembic=1.5.4=pyhd8ed1ab_0
11+
- alembic=1.5.5=pyhd8ed1ab_0
1212
- anyio=2.1.0=py37h89c1867_0
13-
- argon2-cffi=20.1.0=py37h5e8e339_2
13+
- argon2-cffi=20.1.0=py37h8f50634_2
1414
- async_generator=1.10=py_0
1515
- attrs=20.3.0=pyhd3deb0d_0
1616
- babel=2.9.0=pyhd3deb0d_0
@@ -19,7 +19,7 @@ dependencies:
1919
- backports.functools_lru_cache=1.6.1=py_0
2020
- bleach=3.3.0=pyh44b312d_0
2121
- blinker=1.4=py_1
22-
- brotlipy=0.7.0=py37h5e8e339_1001
22+
- brotlipy=0.7.0=py37hb5d75c8_1001
2323
- c-ares=1.17.1=h36c2ea0_0
2424
- ca-certificates=2020.12.5=ha878542_0
2525
- certifi=2020.12.5=py37h89c1867_1
@@ -29,28 +29,29 @@ dependencies:
2929
- cryptography=3.4.4=py37hf1a17b8_0
3030
- decorator=4.4.2=py_0
3131
- defusedxml=0.6.0=py_0
32-
- entrypoints=0.3=pyhd8ed1ab_1003
32+
- entrypoints=0.3=py37hc8dfbb8_1002
3333
- idna=2.10=pyh9f0ad1d_0
3434
- importlib-metadata=3.4.0=py37h89c1867_0
3535
- importlib_metadata=3.4.0=hd8ed1ab_0
36-
- ipykernel=5.4.2=py37h888b3d9_0
36+
- ipykernel=5.5.0=py37h888b3d9_1
3737
- ipython=7.20.0=py37h888b3d9_2
3838
- ipython_genutils=0.2.0=py_1
3939
- ipywidgets=7.6.3=pyhd3deb0d_0
4040
- jedi=0.18.0=py37h89c1867_2
4141
- jinja2=2.11.3=pyh44b312d_0
4242
- json5=0.9.5=pyh9f0ad1d_0
43-
- jsonschema=3.2.0=py_2
43+
- jsonschema=3.2.0=py37hc8dfbb8_1
4444
- jupyter-offlinenotebook=0.2.1=pyhd8ed1ab_0
4545
- jupyter-resource-usage=0.5.1=pyhd8ed1ab_0
4646
- jupyter_client=6.1.11=pyhd8ed1ab_1
4747
- jupyter_core=4.7.1=py37h89c1867_0
48-
- jupyter_server=1.3.0=py37h89c1867_0
48+
- jupyter_server=1.4.0=py37h89c1867_0
4949
- jupyter_telemetry=0.1.0=pyhd8ed1ab_1
50-
- jupyterhub-base=1.1.0=py37hc8dfbb8_5
51-
- jupyterhub-singleuser=1.1.0=py37hc8dfbb8_5
50+
- jupyterhub-base=1.3.0=py37h89c1867_0
51+
- jupyterhub-singleuser=1.3.0=py37h89c1867_0
5252
- jupyterlab=3.0.7=pyhd8ed1ab_0
53-
- jupyterlab_server=2.2.0=pyhd8ed1ab_0
53+
- jupyterlab_pygments=0.1.2=pyh9f0ad1d_0
54+
- jupyterlab_server=2.3.0=pyhd8ed1ab_0
5455
- jupyterlab_widgets=1.0.0=pyhd8ed1ab_1
5556
- krb5=1.17.2=h926e7f8_0
5657
- ld_impl_linux-64=2.35.1=hea4e1c9_2
@@ -61,27 +62,29 @@ dependencies:
6162
- libgcc-ng=9.3.0=h2828fa1_18
6263
- libgomp=9.3.0=h2828fa1_18
6364
- libnghttp2=1.43.0=h812cca2_0
64-
- libsodium=1.0.18=h36c2ea0_1
65+
- libsodium=1.0.18=h516909a_1
6566
- libssh2=1.9.0=hab1572f_5
6667
- libstdcxx-ng=9.3.0=h6de172a_18
6768
- mako=1.1.4=pyh44b312d_0
6869
- markupsafe=1.1.1=py37h5e8e339_3
6970
- mistune=0.8.4=py37h5e8e339_1003
7071
- nbclassic=0.2.6=pyhd8ed1ab_0
71-
- nbconvert=5.6.1=py37hc8dfbb8_1
72+
- nbclient=0.5.2=pyhd8ed1ab_0
73+
- nbconvert=6.0.7=py37h89c1867_3
7274
- nbformat=5.1.2=pyhd8ed1ab_1
7375
- ncurses=6.2=h58526e2_4
74-
- notebook=6.1.6=py37h89c1867_0
76+
- nest-asyncio=1.4.3=pyhd8ed1ab_0
77+
- notebook=6.2.0=py37h89c1867_0
7578
- nteract_on_jupyter=2.1.3=py_0
7679
- oauthlib=3.0.1=py_0
77-
- openssl=1.1.1i=h7f98852_0
80+
- openssl=1.1.1j=h7f98852_0
7881
- packaging=20.9=pyh44b312d_0
7982
- pamela=1.0.0=py_0
8083
- pandoc=2.11.4=h7f98852_0
8184
- pandocfilters=1.4.2=py_1
8285
- parso=0.8.1=pyhd8ed1ab_0
83-
- pexpect=4.8.0=pyh9f0ad1d_2
84-
- pickleshare=0.7.5=py_1003
86+
- pexpect=4.8.0=py37hc8dfbb8_1
87+
- pickleshare=0.7.5=py37hc8dfbb8_1002
8588
- pip=21.0.1=pyhd8ed1ab_0
8689
- prometheus_client=0.9.0=pyhd3deb0d_0
8790
- prompt-toolkit=3.0.16=pyha770c72_0
@@ -95,7 +98,7 @@ dependencies:
9598
- pyparsing=2.4.7=pyh9f0ad1d_0
9699
- pyrsistent=0.17.3=py37h5e8e339_2
97100
- pysocks=1.7.1=py37h89c1867_3
98-
- python=3.7.9=hffdb5ce_100_cpython
101+
- python=3.7.10=hffdb5ce_100_cpython
99102
- python-dateutil=2.8.1=py_0
100103
- python-editor=1.0.4=py_0
101104
- python-json-logger=2.0.1=pyh9f0ad1d_0
@@ -114,18 +117,17 @@ dependencies:
114117
- sqlite=3.34.0=h74cdb3f_0
115118
- terminado=0.9.2=py37h89c1867_0
116119
- testpath=0.4.4=py_0
117-
- tk=8.6.10=h21135ba_1
120+
- tk=8.6.10=hed695b0_1
118121
- tornado=6.1=py37h5e8e339_1
119122
- traitlets=5.0.5=py_0
120123
- typing_extensions=3.7.4.3=py_0
121124
- urllib3=1.26.3=pyhd8ed1ab_0
122125
- wcwidth=0.2.5=pyh9f0ad1d_2
123126
- webencodings=0.5.1=py_1
124127
- wheel=0.36.2=pyhd3deb0d_0
125-
- widgetsnbextension=3.5.1=py37h89c1867_4
128+
- widgetsnbextension=3.5.1=py37hc8dfbb8_4
126129
- xz=5.2.5=h516909a_1
127130
- zeromq=4.3.4=h9c3ff4c_0
128131
- zipp=3.4.0=py_0
129132
- zlib=1.2.11=h516909a_1010
130133
prefix: /opt/conda/envs/r2d
131-
Lines changed: 11 additions & 12 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 2021-02-16 14:41:11 UTC
2+
# Frozen on 2021-02-22 12:21:22 UTC
33
name: r2d
44
channels:
55
- conda-forge
@@ -8,9 +8,9 @@ channels:
88
dependencies:
99
- _libgcc_mutex=0.1=conda_forge
1010
- _openmp_mutex=4.5=1_gnu
11-
- backports=1.0=py_2
12-
- backports.shutil_get_terminal_size=1.0.0=py_3
13-
- backports_abc=0.5=py_1
11+
- backports=1.0=py27_1
12+
- backports.shutil_get_terminal_size=1.0.0=py27_1
13+
- backports_abc=0.5=py27_0
1414
- ca-certificates=2020.12.5=ha878542_0
1515
- certifi=2019.11.28=py27h8c360ce_1
1616
- configparser=3.7.3=py27h8c360ce_2
@@ -20,7 +20,7 @@ dependencies:
2020
- futures=3.3.0=py27h8c360ce_1
2121
- ipykernel=4.8.2=py27_0
2222
- ipython=5.8.0=py27_1
23-
- ipython_genutils=0.2.0=py_1
23+
- ipython_genutils=0.2.0=py27_0
2424
- jupyter_client=5.3.4=py27_1
2525
- jupyter_core=4.6.3=py27h8c360ce_1
2626
- ld_impl_linux-64=2.35.1=hea4e1c9_2
@@ -30,12 +30,12 @@ dependencies:
3030
- libsodium=1.0.17=h516909a_0
3131
- libstdcxx-ng=9.3.0=h6de172a_18
3232
- ncurses=6.2=h58526e2_4
33-
- openssl=1.1.1i=h7f98852_0
33+
- openssl=1.1.1j=h7f98852_0
3434
- pathlib2=2.3.5=py27h8c360ce_1
35-
- pexpect=4.8.0=pyh9f0ad1d_2
35+
- pexpect=4.8.0=py27h8c360ce_1
3636
- pickleshare=0.7.5=py27h8c360ce_1001
3737
- pip=20.1.1=pyh9f0ad1d_0
38-
- prompt_toolkit=1.0.15=py_1
38+
- prompt_toolkit=1.0.15=py27_0
3939
- ptyprocess=0.7.0=pyhd3deb0d_0
4040
- pygments=2.5.2=py_0
4141
- python=2.7.15=h5a48372_1011_cpython
@@ -45,16 +45,15 @@ dependencies:
4545
- readline=8.0=he28a2e2_2
4646
- scandir=1.10.0=py27hdf8410d_1
4747
- setuptools=44.0.0=py27_0
48-
- simplegeneric=0.8.1=py_1
49-
- singledispatch=3.4.0.3=pyh9f0ad1d_1001
48+
- simplegeneric=0.8.1=py27_0
49+
- singledispatch=3.6.0=pyh44b312d_0
5050
- six=1.15.0=pyh9f0ad1d_0
5151
- sqlite=3.34.0=h74cdb3f_0
52-
- tk=8.6.10=h21135ba_1
52+
- tk=8.6.10=hed695b0_1
5353
- tornado=5.1.1=py27h14c3975_1000
5454
- traitlets=4.3.3=py27h8c360ce_1
5555
- wcwidth=0.1.9=pyh9f0ad1d_0
5656
- wheel=0.36.2=pyhd3deb0d_0
5757
- zeromq=4.3.2=he1b5a44_2
5858
- zlib=1.2.11=h516909a_1010
5959
prefix: /opt/conda/envs/r2d
60-

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

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# AUTO GENERATED FROM environment.py-3.6.yml, DO NOT MANUALLY MODIFY
2-
# Frozen on 2021-02-16 14:42:56 UTC
2+
# Frozen on 2021-02-22 12:25:15 UTC
33
name: r2d
44
channels:
55
- conda-forge
@@ -8,18 +8,18 @@ channels:
88
dependencies:
99
- _libgcc_mutex=0.1=conda_forge
1010
- _openmp_mutex=4.5=1_gnu
11-
- alembic=1.5.4=pyhd8ed1ab_0
11+
- alembic=1.5.5=pyhd8ed1ab_0
1212
- anyio=2.1.0=py36h5fab9bb_0
1313
- argon2-cffi=20.1.0=py36h8f6f2f9_2
1414
- async_generator=1.10=py_0
1515
- attrs=20.3.0=pyhd3deb0d_0
1616
- babel=2.9.0=pyhd3deb0d_0
1717
- backcall=0.2.0=pyh9f0ad1d_0
18-
- backports=1.0=py_2
18+
- backports=1.0=py36_1
1919
- backports.functools_lru_cache=1.6.1=py_0
2020
- bleach=3.3.0=pyh44b312d_0
2121
- blinker=1.4=py_1
22-
- brotlipy=0.7.0=py36h8f6f2f9_1001
22+
- brotlipy=0.7.0=py36he6145b8_1001
2323
- c-ares=1.17.1=h36c2ea0_0
2424
- ca-certificates=2020.12.5=ha878542_0
2525
- certifi=2020.12.5=py36h5fab9bb_1
@@ -28,32 +28,33 @@ dependencies:
2828
- chardet=4.0.0=py36h5fab9bb_1
2929
- contextvars=2.4=py_0
3030
- cryptography=3.4.4=py36hc39840e_0
31-
- dataclasses=0.7=pyhe4b4509_6
31+
- dataclasses=0.7=py36_0
3232
- decorator=4.4.2=py_0
3333
- defusedxml=0.6.0=py_0
34-
- entrypoints=0.3=pyhd8ed1ab_1003
34+
- entrypoints=0.3=py36h9f0ad1d_1002
3535
- idna=2.10=pyh9f0ad1d_0
3636
- immutables=0.15=py36h8f6f2f9_0
3737
- importlib-metadata=3.4.0=py36h5fab9bb_0
3838
- importlib_metadata=3.4.0=hd8ed1ab_0
39-
- ipykernel=5.4.2=py36he448a4c_0
39+
- ipykernel=5.5.0=py36he448a4c_1
4040
- ipython=7.16.1=py36he448a4c_2
41-
- ipython_genutils=0.2.0=py_1
41+
- ipython_genutils=0.2.0=py36_0
4242
- ipywidgets=7.6.3=pyhd3deb0d_0
43-
- jedi=0.17.2=py36h5fab9bb_1
43+
- jedi=0.17.2=py36h9f0ad1d_1
4444
- jinja2=2.11.3=pyh44b312d_0
4545
- json5=0.9.5=pyh9f0ad1d_0
46-
- jsonschema=3.2.0=py_2
46+
- jsonschema=3.2.0=py36h9f0ad1d_1
4747
- jupyter-offlinenotebook=0.2.1=pyhd8ed1ab_0
4848
- jupyter-resource-usage=0.5.1=pyhd8ed1ab_0
4949
- jupyter_client=6.1.11=pyhd8ed1ab_1
5050
- jupyter_core=4.7.1=py36h5fab9bb_0
51-
- jupyter_server=1.3.0=py36h5fab9bb_0
51+
- jupyter_server=1.4.0=py36h5fab9bb_0
5252
- jupyter_telemetry=0.1.0=pyhd8ed1ab_1
53-
- jupyterhub-base=1.1.0=py36h9f0ad1d_5
54-
- jupyterhub-singleuser=1.1.0=py36h9f0ad1d_5
53+
- jupyterhub-base=1.3.0=py36h5fab9bb_0
54+
- jupyterhub-singleuser=1.3.0=py36h5fab9bb_0
5555
- jupyterlab=3.0.7=pyhd8ed1ab_0
56-
- jupyterlab_server=2.2.0=pyhd8ed1ab_0
56+
- jupyterlab_pygments=0.1.2=pyh9f0ad1d_0
57+
- jupyterlab_server=2.3.0=pyhd8ed1ab_0
5758
- jupyterlab_widgets=1.0.0=pyhd8ed1ab_1
5859
- krb5=1.17.2=h926e7f8_0
5960
- ld_impl_linux-64=2.35.1=hea4e1c9_2
@@ -64,27 +65,29 @@ dependencies:
6465
- libgcc-ng=9.3.0=h2828fa1_18
6566
- libgomp=9.3.0=h2828fa1_18
6667
- libnghttp2=1.43.0=h812cca2_0
67-
- libsodium=1.0.18=h36c2ea0_1
68+
- libsodium=1.0.18=h516909a_1
6869
- libssh2=1.9.0=hab1572f_5
6970
- libstdcxx-ng=9.3.0=h6de172a_18
7071
- mako=1.1.4=pyh44b312d_0
7172
- markupsafe=1.1.1=py36h8f6f2f9_3
7273
- mistune=0.8.4=py36h8f6f2f9_1003
7374
- nbclassic=0.2.6=pyhd8ed1ab_0
74-
- nbconvert=5.6.1=py36h9f0ad1d_1
75+
- nbclient=0.5.2=pyhd8ed1ab_0
76+
- nbconvert=6.0.7=py36h5fab9bb_3
7577
- nbformat=5.1.2=pyhd8ed1ab_1
7678
- ncurses=6.2=h58526e2_4
77-
- notebook=6.1.6=py36h5fab9bb_0
79+
- nest-asyncio=1.4.3=pyhd8ed1ab_0
80+
- notebook=6.2.0=py36h5fab9bb_0
7881
- nteract_on_jupyter=2.1.3=py_0
7982
- oauthlib=3.0.1=py_0
80-
- openssl=1.1.1i=h7f98852_0
83+
- openssl=1.1.1j=h7f98852_0
8184
- packaging=20.9=pyh44b312d_0
8285
- pamela=1.0.0=py_0
8386
- pandoc=2.11.4=h7f98852_0
84-
- pandocfilters=1.4.2=py_1
87+
- pandocfilters=1.4.2=py36_0
8588
- parso=0.7.1=pyh9f0ad1d_0
86-
- pexpect=4.8.0=pyh9f0ad1d_2
87-
- pickleshare=0.7.5=py_1003
89+
- pexpect=4.8.0=py36h9f0ad1d_1
90+
- pickleshare=0.7.5=py36h9f0ad1d_1002
8891
- pip=21.0.1=pyhd8ed1ab_0
8992
- prometheus_client=0.9.0=pyhd3deb0d_0
9093
- prompt-toolkit=3.0.16=pyha770c72_0
@@ -98,7 +101,7 @@ dependencies:
98101
- pyparsing=2.4.7=pyh9f0ad1d_0
99102
- pyrsistent=0.17.3=py36h8f6f2f9_2
100103
- pysocks=1.7.1=py36h5fab9bb_3
101-
- python=3.6.12=hffdb5ce_0_cpython
104+
- python=3.6.13=hffdb5ce_0_cpython
102105
- python-dateutil=2.8.1=py_0
103106
- python-editor=1.0.4=py_0
104107
- python-json-logger=2.0.1=pyh9f0ad1d_0
@@ -117,18 +120,17 @@ dependencies:
117120
- sqlite=3.34.0=h74cdb3f_0
118121
- terminado=0.9.2=py36h5fab9bb_0
119122
- testpath=0.4.4=py_0
120-
- tk=8.6.10=h21135ba_1
123+
- tk=8.6.10=hed695b0_1
121124
- tornado=6.1=py36h8f6f2f9_1
122125
- traitlets=4.3.3=py36h9f0ad1d_1
123126
- typing_extensions=3.7.4.3=py_0
124127
- urllib3=1.26.3=pyhd8ed1ab_0
125128
- wcwidth=0.2.5=pyh9f0ad1d_2
126129
- webencodings=0.5.1=py_1
127130
- wheel=0.36.2=pyhd3deb0d_0
128-
- widgetsnbextension=3.5.1=py36h5fab9bb_4
131+
- widgetsnbextension=3.5.1=py36h9f0ad1d_4
129132
- xz=5.2.5=h516909a_1
130133
- zeromq=4.3.4=h9c3ff4c_0
131134
- zipp=3.4.0=py_0
132135
- zlib=1.2.11=h516909a_1010
133136
prefix: /opt/conda/envs/r2d
134-
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# AUTO GENERATED FROM environment.yml, DO NOT MANUALLY MODIFY
2-
# Generated on 2021-02-16 14:42:56 UTC
2+
# Generated on 2021-02-22 12:25:15 UTC
33
dependencies:
44
- python=3.6.*
55
- ipywidgets==7.6.3
66
- jupyter-offlinenotebook==0.2.1
77
- jupyter-resource-usage==0.5.1
88
- jupyterlab==3.0.7
9-
- jupyterhub-singleuser==1.1.0
10-
- nbconvert==5.6.1
11-
- notebook==6.1.6
9+
- jupyterhub-singleuser==1.3.0
10+
- nbconvert==6.0.7
11+
- notebook==6.2.0
1212
- nteract_on_jupyter==2.1.3

0 commit comments

Comments
 (0)