Skip to content

Commit f3989a6

Browse files
committed
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.
1 parent 81f35ba commit f3989a6

File tree

7 files changed

+159
-68
lines changed

7 files changed

+159
-68
lines changed

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,5 @@ include/
2525
generated/
2626
test_file_text.txt
2727

28-
# Untracked artifacts from the conda script
29-
repo2docker/buildpacks/conda/environment.py-3.6.yml
3028

3129
\.vscode/

repo2docker/buildpacks/conda/environment.frozen.yml

Lines changed: 38 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,85 @@
1-
# py3.5 conda packages are no longer being updated as of 12/2018
2-
# this file is hand-maintained now
3-
# and should only receive security fixes, no new features
1+
# AUTO GENERATED FROM environment.py-3.6.yml, DO NOT MANUALLY MODIFY
2+
# Frozen on 2018-12-11 21:19:13 UTC
43
name: r2d
54
channels:
65
- conda-forge
76
- defaults
87
- conda-forge/label/broken
98
dependencies:
9+
- attrs=18.2.0=py_0
1010
- backcall=0.1.0=py_0
1111
- bleach=3.0.2=py_0
12-
- bzip2=1.0.6=h470a237_2
13-
- ca-certificates=2018.10.15=ha4d7672_0
14-
- certifi=2018.8.24=py35_1001
12+
- ca-certificates=2018.11.29=ha4d7672_0
13+
- certifi=2018.11.29=py36_1000
1514
- decorator=4.3.0=py_0
1615
- defusedxml=0.5.0=py_1
17-
- entrypoints=0.2.3=py35_2
16+
- entrypoints=0.2.3=py36_1002
1817
- gmp=6.1.2=hfc679d8_0
19-
- ipykernel=5.1.0=pyh24bf2e0_0
20-
- ipython=7.0.1=py35h24bf2e0_0
18+
- ipykernel=5.1.0=py36h24bf2e0_1001
19+
- ipython=7.2.0=py36h24bf2e0_1000
2120
- ipython_genutils=0.2.0=py_1
22-
- ipywidgets=7.2.1=py35_1
23-
- jedi=0.12.1=py35_0
21+
- ipywidgets=7.2.1=py36_1
22+
- jedi=0.13.1=py36_1000
2423
- jinja2=2.10=py_1
25-
- jsonschema=2.6.0=py35_2
26-
- jupyter_client=5.2.3=py_1
24+
- jsonschema=3.0.0a3=py36_1000
25+
- jupyter_client=5.2.4=py_0
2726
- jupyter_core=4.4.0=py_0
28-
- jupyterlab=0.34.9=py35_0
27+
- jupyterlab=0.34.9=py36_0
2928
- jupyterlab_launcher=0.13.1=py_2
3029
- libffi=3.2.1=hfc679d8_5
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=py35h470a237_1
35-
- mistune=0.8.3=py35h470a237_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
38-
- ncurses=6.1=hfc679d8_1
39-
- notebook=5.7.0=py35_0
37+
- ncurses=6.1=hfc679d8_2
38+
- notebook=5.7.2=py36_1000
4039
- 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=py35_0
45-
- pickleshare=0.7.5=py35_0
46-
- pip=18.0=py35_1001
47-
- prometheus_client=0.4.2=py_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.5.0=py_0
4847
- prompt_toolkit=2.0.7=py_0
49-
- ptyprocess=0.6.0=py35_1000
50-
- pygments=2.2.0=py_1
51-
- python=3.5.5=h5001a0f_2
48+
- ptyprocess=0.6.0=py36_1000
49+
- pygments=2.3.0=py_0
50+
- pyrsistent=0.14.7=py36h470a237_0
51+
- python=3.6.7=h5001a0f_1
5252
- python-dateutil=2.7.5=py_0
53-
- pyzmq=17.1.2=py35hae99301_0
53+
- pyzmq=17.1.2=py36hae99301_1
5454
- readline=7.0=haf1bffa_1
5555
- send2trash=1.5.0=py_0
56-
- setuptools=40.4.3=py35_0
57-
- simplegeneric=0.8.1=py_1
58-
- six=1.11.0=py35_1
59-
- sqlite=3.25.3=hb1c47c0_0
60-
- terminado=0.8.1=py35_1
61-
- testpath=0.3.1=py35_1
56+
- setuptools=40.6.2=py36_0
57+
- six=1.12.0=py36_1000
58+
- sqlite=3.26.0=hb1c47c0_0
59+
- terminado=0.8.1=py36_1001
60+
- testpath=0.4.2=py36_1000
6261
- tk=8.6.9=ha92aebf_0
63-
- tornado=5.1.1=py35h470a237_0
64-
- traitlets=4.3.2=py35_0
62+
- tornado=5.1.1=py36h470a237_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.32.0=py35_1000
68-
- widgetsnbextension=3.2.1=py35_1
66+
- wheel=0.32.3=py36_0
67+
- widgetsnbextension=3.2.1=py36_1
6968
- xz=5.2.4=h470a237_1
7069
- zeromq=4.2.5=hfc679d8_6
7170
- zlib=1.2.11=h470a237_3
7271
- pip:
73-
- alembic==1.0.3
72+
- alembic==1.0.5
7473
- async-generator==1.10
7574
- chardet==3.0.4
76-
- idna==2.7
75+
- idna==2.8
7776
- jupyterhub==0.9.4
7877
- mako==1.0.7
79-
- notebook==5.7.2
8078
- nteract-on-jupyter==1.9.6
8179
- pamela==0.3.0
8280
- python-editor==1.0.3
8381
- python-oauth2==1.1.0
84-
- requests==2.20.1
82+
- requests==2.21.0
8583
- sqlalchemy==1.2.14
8684
- urllib3==1.24.1
8785
prefix: /opt/conda/envs/r2d

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

Lines changed: 10 additions & 10 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-11-20 06:11:34 UTC
2+
# Frozen on 2018-12-11 21:15:11 UTC
33
name: r2d
44
channels:
55
- conda-forge
@@ -9,39 +9,39 @@ 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-
- ca-certificates=2018.10.15=ha4d7672_0
13-
- certifi=2018.10.15=py27_1000
12+
- ca-certificates=2018.11.29=ha4d7672_0
13+
- certifi=2018.11.29=py27_1000
1414
- decorator=4.3.0=py_0
1515
- enum34=1.1.6=py27_1001
1616
- futures=3.2.0=py27_1000
1717
- ipykernel=4.8.2=py27_0
1818
- ipython=5.8.0=py27_0
1919
- ipython_genutils=0.2.0=py_1
20-
- jupyter_client=5.2.3=py_1
20+
- jupyter_client=5.2.4=py_0
2121
- jupyter_core=4.4.0=py_0
2222
- libffi=3.2.1=hfc679d8_5
2323
- libgcc-ng=7.2.0=hdf63c60_3
2424
- libsodium=1.0.16=h470a237_1
2525
- libstdcxx-ng=7.2.0=hdf63c60_3
26-
- ncurses=6.1=hfc679d8_1
26+
- ncurses=6.1=hfc679d8_2
2727
- openssl=1.0.2p=h470a237_1
28-
- pathlib2=2.3.2=py27_1000
28+
- pathlib2=2.3.3=py27_1000
2929
- pexpect=4.6.0=py27_1000
3030
- pickleshare=0.7.5=py27_1000
3131
- pip=18.1=py27_1000
3232
- prompt_toolkit=1.0.15=py_1
3333
- ptyprocess=0.6.0=py27_1000
34-
- pygments=2.2.0=py_1
35-
- python=2.7.15=h33da82c_4
34+
- pygments=2.3.0=py_0
35+
- python=2.7.15=h33da82c_6
3636
- python-dateutil=2.7.5=py_0
3737
- pyzmq=17.1.2=py27hae99301_1
3838
- readline=7.0=haf1bffa_1
3939
- scandir=1.9.0=py27h470a237_0
4040
- setuptools=40.6.2=py27_0
4141
- simplegeneric=0.8.1=py_1
4242
- singledispatch=3.4.0.3=py27_1000
43-
- six=1.11.0=py27_1001
44-
- sqlite=3.25.3=hb1c47c0_0
43+
- six=1.12.0=py27_1000
44+
- sqlite=3.26.0=hb1c47c0_0
4545
- tk=8.6.9=ha92aebf_0
4646
- tornado=5.1.1=py27h470a237_0
4747
- traitlets=4.3.2=py27_1000
Lines changed: 85 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,86 @@
11
# AUTO GENERATED FROM environment.py-3.6.yml, DO NOT MANUALLY MODIFY
2-
# Frozen on 2018-12-11 09:51:24 UTC
2+
# Frozen on 2018-12-11 21:19:13 UTC
3+
name: r2d
4+
channels:
5+
- conda-forge
6+
- defaults
7+
- conda-forge/label/broken
8+
dependencies:
9+
- attrs=18.2.0=py_0
10+
- backcall=0.1.0=py_0
11+
- bleach=3.0.2=py_0
12+
- ca-certificates=2018.11.29=ha4d7672_0
13+
- certifi=2018.11.29=py36_1000
14+
- decorator=4.3.0=py_0
15+
- defusedxml=0.5.0=py_1
16+
- entrypoints=0.2.3=py36_1002
17+
- gmp=6.1.2=hfc679d8_0
18+
- ipykernel=5.1.0=py36h24bf2e0_1001
19+
- ipython=7.2.0=py36h24bf2e0_1000
20+
- ipython_genutils=0.2.0=py_1
21+
- ipywidgets=7.2.1=py36_1
22+
- jedi=0.13.1=py36_1000
23+
- jinja2=2.10=py_1
24+
- jsonschema=3.0.0a3=py36_1000
25+
- jupyter_client=5.2.4=py_0
26+
- jupyter_core=4.4.0=py_0
27+
- jupyterlab=0.34.9=py36_0
28+
- jupyterlab_launcher=0.13.1=py_2
29+
- libffi=3.2.1=hfc679d8_5
30+
- libgcc-ng=7.2.0=hdf63c60_3
31+
- libsodium=1.0.16=h470a237_1
32+
- libstdcxx-ng=7.2.0=hdf63c60_3
33+
- markupsafe=1.1.0=py36h470a237_0
34+
- mistune=0.8.4=py36h470a237_0
35+
- nbconvert=5.4.0=1
36+
- nbformat=4.4.0=py_1
37+
- ncurses=6.1=hfc679d8_2
38+
- notebook=5.7.2=py36_1000
39+
- openssl=1.0.2p=h470a237_1
40+
- pandoc=1.19.2=0
41+
- pandocfilters=1.4.2=py_1
42+
- parso=0.3.1=py_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.5.0=py_0
47+
- prompt_toolkit=2.0.7=py_0
48+
- ptyprocess=0.6.0=py36_1000
49+
- pygments=2.3.0=py_0
50+
- pyrsistent=0.14.7=py36h470a237_0
51+
- python=3.6.7=h5001a0f_1
52+
- python-dateutil=2.7.5=py_0
53+
- pyzmq=17.1.2=py36hae99301_1
54+
- readline=7.0=haf1bffa_1
55+
- send2trash=1.5.0=py_0
56+
- setuptools=40.6.2=py36_0
57+
- six=1.12.0=py36_1000
58+
- sqlite=3.26.0=hb1c47c0_0
59+
- terminado=0.8.1=py36_1001
60+
- testpath=0.4.2=py36_1000
61+
- tk=8.6.9=ha92aebf_0
62+
- tornado=5.1.1=py36h470a237_0
63+
- traitlets=4.3.2=py36_1000
64+
- wcwidth=0.1.7=py_1
65+
- webencodings=0.5.1=py_1
66+
- wheel=0.32.3=py36_0
67+
- widgetsnbextension=3.2.1=py36_1
68+
- xz=5.2.4=h470a237_1
69+
- zeromq=4.2.5=hfc679d8_6
70+
- zlib=1.2.11=h470a237_3
71+
- pip:
72+
- alembic==1.0.5
73+
- async-generator==1.10
74+
- chardet==3.0.4
75+
- idna==2.8
76+
- jupyterhub==0.9.4
77+
- mako==1.0.7
78+
- 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.21.0
83+
- sqlalchemy==1.2.14
84+
- urllib3==1.24.1
85+
prefix: /opt/conda/envs/r2d
86+
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# AUTO GENERATED FROM environment.yml, DO NOT MANUALLY MODIFY
2+
# Generated on 2018-12-11 21:19:13 UTC
3+
dependencies:
4+
- python=3.6.*
5+
- ipywidgets==7.2.1
6+
- jupyterlab==0.34.9
7+
- nbconvert==5.4.0
8+
- notebook==5.7.2
9+
- pip:
10+
- nteract_on_jupyter==1.9.6
11+
- jupyterhub==0.9.4

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

Lines changed: 14 additions & 14 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 2018-11-20 06:13:10 UTC
2+
# Frozen on 2018-12-11 21:16:37 UTC
33
name: r2d
44
channels:
55
- conda-forge
@@ -10,19 +10,19 @@ dependencies:
1010
- backcall=0.1.0=py_0
1111
- bleach=3.0.2=py_0
1212
- bzip2=1.0.6=h470a237_2
13-
- ca-certificates=2018.10.15=ha4d7672_0
14-
- certifi=2018.10.15=py37_1000
13+
- ca-certificates=2018.11.29=ha4d7672_0
14+
- certifi=2018.11.29=py37_1000
1515
- decorator=4.3.0=py_0
1616
- defusedxml=0.5.0=py_1
1717
- entrypoints=0.2.3=py37_1002
1818
- gmp=6.1.2=hfc679d8_0
1919
- ipykernel=5.1.0=py37h24bf2e0_1001
20-
- ipython=7.1.1=py37h24bf2e0_1000
20+
- ipython=7.2.0=py37h24bf2e0_1000
2121
- ipython_genutils=0.2.0=py_1
2222
- jedi=0.13.1=py37_1000
2323
- jinja2=2.10=py_1
2424
- jsonschema=3.0.0a3=py37_1000
25-
- jupyter_client=5.2.3=py_1
25+
- jupyter_client=5.2.4=py_0
2626
- jupyter_core=4.4.0=py_0
2727
- jupyterlab_launcher=0.13.1=py_2
2828
- libffi=3.2.1=hfc679d8_5
@@ -33,7 +33,7 @@ dependencies:
3333
- mistune=0.8.4=py37h470a237_0
3434
- nbconvert=5.4.0=1
3535
- nbformat=4.4.0=py_1
36-
- ncurses=6.1=hfc679d8_1
36+
- ncurses=6.1=hfc679d8_2
3737
- notebook=5.7.2=py37_1000
3838
- openssl=1.0.2p=h470a237_1
3939
- pandoc=1.19.2=0
@@ -42,19 +42,19 @@ dependencies:
4242
- pexpect=4.6.0=py37_1000
4343
- pickleshare=0.7.5=py37_1000
4444
- pip=18.1=py37_1000
45-
- prometheus_client=0.4.2=py_0
45+
- prometheus_client=0.5.0=py_0
4646
- prompt_toolkit=2.0.7=py_0
4747
- ptyprocess=0.6.0=py37_1000
48-
- pygments=2.2.0=py_1
49-
- pyrsistent=0.14.6=py37h470a237_0
48+
- pygments=2.3.0=py_0
49+
- pyrsistent=0.14.7=py37h470a237_0
5050
- python=3.7.1=h5001a0f_0
5151
- python-dateutil=2.7.5=py_0
5252
- pyzmq=17.1.2=py37hae99301_1
5353
- readline=7.0=haf1bffa_1
5454
- send2trash=1.5.0=py_0
5555
- setuptools=40.6.2=py37_0
56-
- six=1.11.0=py37_1001
57-
- sqlite=3.25.3=hb1c47c0_0
56+
- six=1.12.0=py37_1000
57+
- sqlite=3.26.0=hb1c47c0_0
5858
- terminado=0.8.1=py37_1001
5959
- testpath=0.4.2=py37_1000
6060
- tk=8.6.9=ha92aebf_0
@@ -70,17 +70,17 @@ dependencies:
7070
- ipywidgets=7.2.1=py37_0
7171
- jupyterlab=0.34.9=py37_0
7272
- pip:
73-
- alembic==1.0.3
73+
- alembic==1.0.5
7474
- async-generator==1.10
7575
- chardet==3.0.4
76-
- idna==2.7
76+
- idna==2.8
7777
- jupyterhub==0.9.4
7878
- mako==1.0.7
7979
- nteract-on-jupyter==1.9.6
8080
- pamela==0.3.0
8181
- python-editor==1.0.3
8282
- python-oauth2==1.1.0
83-
- requests==2.20.1
83+
- requests==2.21.0
8484
- sqlalchemy==1.2.14
8585
- urllib3==1.24.1
8686
prefix: /opt/conda/envs/r2d

repo2docker/buildpacks/conda/environment.py-3.7.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# AUTO GENERATED FROM environment.yml, DO NOT MANUALLY MODIFY
2-
# Generated on 2018-11-20 06:13:10 UTC
2+
# Generated on 2018-12-11 21:16:37 UTC
33
dependencies:
44
- python=3.7.*
55
- ipywidgets==7.2.1

0 commit comments

Comments
 (0)