Skip to content

Commit f9620ed

Browse files
author
Joseph Hamman
committed
freeze versions
1 parent bf3d0c1 commit f9620ed

File tree

9 files changed

+33
-33
lines changed

9 files changed

+33
-33
lines changed

‎docs/source/changelog.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ New features
1313
:user:`davidanthoff`
1414
- Set JULIA_PROJECT globally, so that every julia instance starts with the
1515
julia environment activated in :pr:`612` by :user:`davidanthoff`.
16-
- Update Miniconda version to 4.5.12 and Conda version to 4.6.10 in :pr:`637` by
16+
- Update Miniconda version to 4.5.12 and Conda version to 4.6.9 in :pr:`637` by
1717
:user:`jhamman`
1818

1919
API changes

‎repo2docker/buildpacks/conda/environment.frozen.yml‎

Lines changed: 8 additions & 8 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 2019-03-23 18:02:15 UTC
2+
# Frozen on 2019-04-04 20:24:39 UTC
33
name: r2d
44
channels:
55
- conda-forge
@@ -27,7 +27,9 @@ dependencies:
2727
- jupyterlab=0.35.4=py37_0
2828
- jupyterlab_server=0.2.0=py_0
2929
- libffi=3.2.1=he1b5a44_1006
30+
- libgcc-ng=8.2.0=hdf63c60_1
3031
- libsodium=1.0.16=h14c3975_1001
32+
- libstdcxx-ng=8.2.0=hdf63c60_1
3133
- markupsafe=1.1.1=py37h14c3975_0
3234
- mistune=0.8.4=py37h14c3975_1000
3335
- nbconvert=5.4.1=py_2
@@ -46,18 +48,18 @@ dependencies:
4648
- ptyprocess=0.6.0=py37_1000
4749
- pygments=2.3.1=py_0
4850
- pyrsistent=0.14.11=py37h14c3975_0
49-
- python=3.7.2=h381d211_0
51+
- python=3.7.3=h5b0a415_0
5052
- python-dateutil=2.8.0=py_0
5153
- pyzmq=18.0.1=py37h0e1adb2_0
5254
- readline=7.0=hf8c457e_1001
5355
- send2trash=1.5.0=py_0
5456
- setuptools=40.8.0=py37_0
5557
- six=1.12.0=py37_1000
5658
- sqlite=3.26.0=h67949de_1001
57-
- terminado=0.8.1=py37_1001
59+
- terminado=0.8.2=py37_0
5860
- testpath=0.4.2=py_1001
59-
- tk=8.6.9=h84994c4_1000
60-
- tornado=6.0.1=py37h14c3975_0
61+
- tk=8.6.9=h84994c4_1001
62+
- tornado=6.0.2=py37h516909a_0
6163
- traitlets=4.3.2=py37_1000
6264
- wcwidth=0.1.7=py_1
6365
- webencodings=0.5.1=py_1
@@ -66,8 +68,6 @@ dependencies:
6668
- xz=5.2.4=h14c3975_1001
6769
- zeromq=4.2.5=hf484d3e_1006
6870
- zlib=1.2.11=h14c3975_1004
69-
- libgcc-ng=8.2.0=hdf63c60_1
70-
- libstdcxx-ng=8.2.0=hdf63c60_1
7171
- pip:
7272
- alembic==1.0.8
7373
- async-generator==1.10
@@ -80,7 +80,7 @@ dependencies:
8080
- python-editor==1.0.4
8181
- python-oauth2==1.1.0
8282
- requests==2.21.0
83-
- sqlalchemy==1.3.1
83+
- sqlalchemy==1.3.2
8484
- urllib3==1.24.1
8585
prefix: /opt/conda/envs/r2d
8686

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

Lines changed: 4 additions & 4 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 2019-03-23 17:59:14 UTC
2+
# Frozen on 2019-04-04 20:21:17 UTC
33
name: r2d
44
channels:
55
- conda-forge
@@ -20,7 +20,9 @@ dependencies:
2020
- jupyter_client=5.2.4=py_3
2121
- jupyter_core=4.4.0=py_0
2222
- libffi=3.2.1=he1b5a44_1006
23+
- libgcc-ng=8.2.0=hdf63c60_1
2324
- libsodium=1.0.16=h14c3975_1001
25+
- libstdcxx-ng=8.2.0=hdf63c60_1
2426
- ncurses=6.1=hf484d3e_1002
2527
- openssl=1.1.1b=h14c3975_1
2628
- pathlib2=2.3.3=py27_1000
@@ -40,14 +42,12 @@ dependencies:
4042
- singledispatch=3.4.0.3=py27_1000
4143
- six=1.12.0=py27_1000
4244
- sqlite=3.26.0=h67949de_1001
43-
- tk=8.6.9=h84994c4_1000
45+
- tk=8.6.9=h84994c4_1001
4446
- tornado=5.1.1=py27h14c3975_1000
4547
- traitlets=4.3.2=py27_1000
4648
- wcwidth=0.1.7=py_1
4749
- wheel=0.33.1=py27_0
4850
- zeromq=4.2.5=hf484d3e_1006
4951
- zlib=1.2.11=h14c3975_1004
50-
- libgcc-ng=8.2.0=hdf63c60_1
51-
- libstdcxx-ng=8.2.0=hdf63c60_1
5252
prefix: /opt/conda/envs/r2d
5353

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

Lines changed: 7 additions & 7 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 2019-03-23 18:00:20 UTC
2+
# Frozen on 2019-04-04 20:22:30 UTC
33
name: r2d
44
channels:
55
- conda-forge
@@ -26,7 +26,9 @@ dependencies:
2626
- jupyterlab=0.35.4=py36_0
2727
- jupyterlab_server=0.2.0=py_0
2828
- libffi=3.2.1=he1b5a44_1006
29+
- libgcc-ng=8.2.0=hdf63c60_1
2930
- libsodium=1.0.16=h14c3975_1001
31+
- libstdcxx-ng=8.2.0=hdf63c60_1
3032
- markupsafe=1.1.1=py36h14c3975_0
3133
- mistune=0.8.4=py36h14c3975_1000
3234
- nbconvert=5.4.1=py_2
@@ -53,10 +55,10 @@ dependencies:
5355
- setuptools=40.8.0=py36_0
5456
- six=1.12.0=py36_1000
5557
- sqlite=3.26.0=h67949de_1001
56-
- terminado=0.8.1=py36_1001
58+
- terminado=0.8.2=py36_0
5759
- testpath=0.4.2=py_1001
58-
- tk=8.6.9=h84994c4_1000
59-
- tornado=6.0.1=py36h14c3975_0
60+
- tk=8.6.9=h84994c4_1001
61+
- tornado=6.0.2=py36h516909a_0
6062
- traitlets=4.3.2=py36_1000
6163
- wcwidth=0.1.7=py_1
6264
- webencodings=0.5.1=py_1
@@ -65,8 +67,6 @@ dependencies:
6567
- xz=5.2.4=h14c3975_1001
6668
- zeromq=4.2.5=hf484d3e_1006
6769
- zlib=1.2.11=h14c3975_1004
68-
- libgcc-ng=8.2.0=hdf63c60_1
69-
- libstdcxx-ng=8.2.0=hdf63c60_1
7070
- pip:
7171
- alembic==1.0.8
7272
- async-generator==1.10
@@ -79,7 +79,7 @@ dependencies:
7979
- python-editor==1.0.4
8080
- python-oauth2==1.1.0
8181
- requests==2.21.0
82-
- sqlalchemy==1.3.1
82+
- sqlalchemy==1.3.2
8383
- urllib3==1.24.1
8484
prefix: /opt/conda/envs/r2d
8585

‎repo2docker/buildpacks/conda/environment.py-3.6.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 2019-03-23 18:00:20 UTC
2+
# Generated on 2019-04-04 20:22:30 UTC
33
dependencies:
44
- python=3.6.*
55
- ipywidgets==7.4.2

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

Lines changed: 8 additions & 8 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 2019-03-23 18:02:15 UTC
2+
# Frozen on 2019-04-04 20:24:39 UTC
33
name: r2d
44
channels:
55
- conda-forge
@@ -27,7 +27,9 @@ dependencies:
2727
- jupyterlab=0.35.4=py37_0
2828
- jupyterlab_server=0.2.0=py_0
2929
- libffi=3.2.1=he1b5a44_1006
30+
- libgcc-ng=8.2.0=hdf63c60_1
3031
- libsodium=1.0.16=h14c3975_1001
32+
- libstdcxx-ng=8.2.0=hdf63c60_1
3133
- markupsafe=1.1.1=py37h14c3975_0
3234
- mistune=0.8.4=py37h14c3975_1000
3335
- nbconvert=5.4.1=py_2
@@ -46,18 +48,18 @@ dependencies:
4648
- ptyprocess=0.6.0=py37_1000
4749
- pygments=2.3.1=py_0
4850
- pyrsistent=0.14.11=py37h14c3975_0
49-
- python=3.7.2=h381d211_0
51+
- python=3.7.3=h5b0a415_0
5052
- python-dateutil=2.8.0=py_0
5153
- pyzmq=18.0.1=py37h0e1adb2_0
5254
- readline=7.0=hf8c457e_1001
5355
- send2trash=1.5.0=py_0
5456
- setuptools=40.8.0=py37_0
5557
- six=1.12.0=py37_1000
5658
- sqlite=3.26.0=h67949de_1001
57-
- terminado=0.8.1=py37_1001
59+
- terminado=0.8.2=py37_0
5860
- testpath=0.4.2=py_1001
59-
- tk=8.6.9=h84994c4_1000
60-
- tornado=6.0.1=py37h14c3975_0
61+
- tk=8.6.9=h84994c4_1001
62+
- tornado=6.0.2=py37h516909a_0
6163
- traitlets=4.3.2=py37_1000
6264
- wcwidth=0.1.7=py_1
6365
- webencodings=0.5.1=py_1
@@ -66,8 +68,6 @@ dependencies:
6668
- xz=5.2.4=h14c3975_1001
6769
- zeromq=4.2.5=hf484d3e_1006
6870
- zlib=1.2.11=h14c3975_1004
69-
- libgcc-ng=8.2.0=hdf63c60_1
70-
- libstdcxx-ng=8.2.0=hdf63c60_1
7171
- pip:
7272
- alembic==1.0.8
7373
- async-generator==1.10
@@ -80,7 +80,7 @@ dependencies:
8080
- python-editor==1.0.4
8181
- python-oauth2==1.1.0
8282
- requests==2.21.0
83-
- sqlalchemy==1.3.1
83+
- sqlalchemy==1.3.2
8484
- urllib3==1.24.1
8585
prefix: /opt/conda/envs/r2d
8686

‎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 2019-03-23 18:02:15 UTC
2+
# Generated on 2019-04-04 20:24:39 UTC
33
dependencies:
44
- python=3.7.*
55
- ipywidgets==7.4.2

‎repo2docker/buildpacks/conda/freeze.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121

2222
# Docker image version can be different than conda version,
2323
# since miniconda3 docker images seem to lag conda releases.
24-
MINICONDA_DOCKER_VERSION = '4.5.11'
25-
CONDA_VERSION = '4.5.11'
24+
MINICONDA_DOCKER_VERSION = '4.5.12'
25+
CONDA_VERSION = '4.6.9'
2626

2727
HERE = pathlib.Path(os.path.dirname(os.path.abspath(__file__)))
2828

‎repo2docker/buildpacks/conda/install-miniconda.bash‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -ex
44

55
cd $(dirname $0)
66
MINICONDA_VERSION=4.5.12
7-
CONDA_VERSION=4.6.10
7+
CONDA_VERSION=4.6.9
88
# Only MD5 checksums are available for miniconda
99
# Can be obtained from https://repo.continuum.io/miniconda/
1010
MD5SUM="866ae9dff53ad0874e1d1a60b1ad1ef8"

0 commit comments

Comments
 (0)