Merge remote-tracking branch 'jhamman/bump_conda_ver' into conda-env

docs/source/changelog.rst

@@ -13,6 +13,8 @@ New features
   :user:`davidanthoff`
 - Set JULIA_PROJECT globally, so that every julia instance starts with the
   julia environment activated in :pr:`612` by :user:`davidanthoff`.
+- Update Miniconda version to 4.5.12 and Conda version to 4.6.9  in :pr:`637` by
+  :user:`jhamman`
 
 API changes
 -----------

repo2docker/buildpacks/conda/environment.frozen.yml

@@ -27,7 +27,9 @@ dependencies:
   - jupyterlab=0.35.4=py37_0
   - jupyterlab_server=0.2.0=py_0
   - libffi=3.2.1=he1b5a44_1006
+  - libgcc-ng=8.2.0=hdf63c60_1
   - libsodium=1.0.16=h14c3975_1001
+  - libstdcxx-ng=8.2.0=hdf63c60_1
   - markupsafe=1.1.1=py37h14c3975_0
   - mistune=0.8.4=py37h14c3975_1000
   - nbconvert=5.4.1=py_2
@@ -66,8 +68,6 @@ dependencies:
   - xz=5.2.4=h14c3975_1001
   - zeromq=4.3.1=hf484d3e_1000
   - zlib=1.2.11=h14c3975_1004
-  - libgcc-ng=8.2.0=hdf63c60_1
-  - libstdcxx-ng=8.2.0=hdf63c60_1
   - pip:
     - alembic==1.0.9
     - async-generator==1.10

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

@@ -20,7 +20,9 @@ dependencies:
   - jupyter_client=5.2.4=py_3
   - jupyter_core=4.4.0=py_0
   - libffi=3.2.1=he1b5a44_1006
+  - libgcc-ng=8.2.0=hdf63c60_1
   - libsodium=1.0.16=h14c3975_1001
+  - libstdcxx-ng=8.2.0=hdf63c60_1
   - ncurses=6.1=hf484d3e_1002
   - openssl=1.1.1b=h14c3975_1
   - pathlib2=2.3.3=py27_1000
@@ -47,7 +49,5 @@ dependencies:
   - wheel=0.33.1=py27_0
   - zeromq=4.3.1=hf484d3e_1000
   - zlib=1.2.11=h14c3975_1004
-  - libgcc-ng=8.2.0=hdf63c60_1
-  - libstdcxx-ng=8.2.0=hdf63c60_1
 prefix: /opt/conda/envs/r2d
 

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

@@ -26,7 +26,9 @@ dependencies:
   - jupyterlab=0.35.4=py36_0
   - jupyterlab_server=0.2.0=py_0
   - libffi=3.2.1=he1b5a44_1006
+  - libgcc-ng=8.2.0=hdf63c60_1
   - libsodium=1.0.16=h14c3975_1001
+  - libstdcxx-ng=8.2.0=hdf63c60_1
   - markupsafe=1.1.1=py36h14c3975_0
   - mistune=0.8.4=py36h14c3975_1000
   - nbconvert=5.4.1=py_2
@@ -65,8 +67,6 @@ dependencies:
   - xz=5.2.4=h14c3975_1001
   - zeromq=4.3.1=hf484d3e_1000
   - zlib=1.2.11=h14c3975_1004
-  - libgcc-ng=8.2.0=hdf63c60_1
-  - libstdcxx-ng=8.2.0=hdf63c60_1
   - pip:
     - alembic==1.0.9
     - async-generator==1.10

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

@@ -27,7 +27,9 @@ dependencies:
   - jupyterlab=0.35.4=py37_0
   - jupyterlab_server=0.2.0=py_0
   - libffi=3.2.1=he1b5a44_1006
+  - libgcc-ng=8.2.0=hdf63c60_1
   - libsodium=1.0.16=h14c3975_1001
+  - libstdcxx-ng=8.2.0=hdf63c60_1
   - markupsafe=1.1.1=py37h14c3975_0
   - mistune=0.8.4=py37h14c3975_1000
   - nbconvert=5.4.1=py_2
@@ -66,8 +68,6 @@ dependencies:
   - xz=5.2.4=h14c3975_1001
   - zeromq=4.3.1=hf484d3e_1000
   - zlib=1.2.11=h14c3975_1004
-  - libgcc-ng=8.2.0=hdf63c60_1
-  - libstdcxx-ng=8.2.0=hdf63c60_1
   - pip:
     - alembic==1.0.9
     - async-generator==1.10

repo2docker/buildpacks/conda/freeze.py

@@ -21,8 +21,8 @@ from ruamel.yaml import YAML
 
 # Docker image version can be different than conda version,
 # since miniconda3 docker images seem to lag conda releases.
-MINICONDA_DOCKER_VERSION = '4.5.11'
-CONDA_VERSION = '4.5.11'
+MINICONDA_DOCKER_VERSION = '4.5.12'
+CONDA_VERSION = '4.6.9'
 
 HERE = pathlib.Path(os.path.dirname(os.path.abspath(__file__)))
 

repo2docker/buildpacks/conda/install-miniconda.bash

@@ -3,8 +3,12 @@
 set -ex
 
 cd $(dirname $0)
-MINICONDA_VERSION=4.5.11
-CONDA_VERSION=4.5.11
+MINICONDA_VERSION=4.5.12
+CONDA_VERSION=4.6.9
+# Only MD5 checksums are available for miniconda
+# Can be obtained from https://repo.continuum.io/miniconda/
+MD5SUM="866ae9dff53ad0874e1d1a60b1ad1ef8"
+
 URL="https://repo.continuum.io/miniconda/Miniconda3-${MINICONDA_VERSION}-Linux-x86_64.sh"
 INSTALLER_PATH=/tmp/miniconda-installer.sh
 
@@ -15,10 +19,7 @@ unset HOME
 wget --quiet $URL -O ${INSTALLER_PATH}
 chmod +x ${INSTALLER_PATH}
 
-# Only MD5 checksums are available for miniconda
-# Can be obtained from https://repo.continuum.io/miniconda/
-MD5SUM="e1045ee415162f944b6aebfe560b8fee"
-
+# check md5 checksum
 if ! echo "${MD5SUM}  ${INSTALLER_PATH}" | md5sum  --quiet -c -; then
     echo "md5sum mismatch for ${INSTALLER_PATH}, exiting!"
     exit 1