From b16eeb8a9eae3ffd1eab0a6861d3b0941cf3a8be Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Mon, 16 Jul 2018 16:30:39 -0700
Subject: [PATCH] bump versions

notebook 5.6
conda 4.5
jupyterlab 32
nteract 1.8
widgets 7.2
---
 repo2docker/buildpacks/conda/environment.yml        |  8 ++++----
 repo2docker/buildpacks/conda/freeze.py              |  6 ++----
 repo2docker/buildpacks/conda/install-miniconda.bash | 10 +++++++---
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/repo2docker/buildpacks/conda/environment.yml b/repo2docker/buildpacks/conda/environment.yml
index 076f6198..3acfaf24 100644
--- a/repo2docker/buildpacks/conda/environment.yml
+++ b/repo2docker/buildpacks/conda/environment.yml
@@ -1,8 +1,8 @@
 dependencies:
   - python=3.6.*
-  - ipywidgets==7.1.1
-  - jupyterlab==0.31.5
+  - ipywidgets==7.2.1
+  - jupyterlab==0.32.1
   - tornado==4.5.3
-  - notebook==5.4.1
+  - notebook==5.6.0
   - pip:
-    - nteract_on_jupyter==1.7.0
+    - nteract_on_jupyter==1.8.1
diff --git a/repo2docker/buildpacks/conda/freeze.py b/repo2docker/buildpacks/conda/freeze.py
index dc8980ed..d193ae6c 100755
--- a/repo2docker/buildpacks/conda/freeze.py
+++ b/repo2docker/buildpacks/conda/freeze.py
@@ -19,9 +19,7 @@ import sys
 from ruamel.yaml import YAML
 
 
-MINICONDA_VERSION = '4.3.27'
-# need conda ≥ 4.4 to avoid bug adding spurious pip dependencies
-CONDA_VERSION = '4.4.11'
+MINICONDA_VERSION = '4.5.4'
 
 HERE = pathlib.Path(os.path.dirname(os.path.abspath(__file__)))
 
@@ -59,7 +57,7 @@ def freeze(env_file, frozen_file):
         f"continuumio/miniconda3:{MINICONDA_VERSION}",
         "sh", "-c",
         '; '.join([
-            f"conda install -yq conda={CONDA_VERSION}",
+            # f"conda install -yq conda={CONDA_VERSION}",
             'conda config --add channels conda-forge',
             'conda config --system --set auto_update_conda false',
             f"conda env create -v -f /r2d/{env_file} -n r2d",
diff --git a/repo2docker/buildpacks/conda/install-miniconda.bash b/repo2docker/buildpacks/conda/install-miniconda.bash
index 1073afba..336e6980 100755
--- a/repo2docker/buildpacks/conda/install-miniconda.bash
+++ b/repo2docker/buildpacks/conda/install-miniconda.bash
@@ -3,8 +3,9 @@
 set -ex
 
 cd $(dirname $0)
-CONDA_VERSION=4.5.1
-URL="https://repo.continuum.io/miniconda/Miniconda3-${CONDA_VERSION}-Linux-x86_64.sh"
+MINICONDA_VERSION=4.5.4
+CONDA_VERSION=4.5.8
+URL="https://repo.continuum.io/miniconda/Miniconda3-${MINICONDA_VERSION}-Linux-x86_64.sh"
 INSTALLER_PATH=/tmp/miniconda-installer.sh
 
 wget --quiet $URL -O ${INSTALLER_PATH}
@@ -12,7 +13,7 @@ chmod +x ${INSTALLER_PATH}
 
 # Only MD5 checksums are available for miniconda
 # Can be obtained from https://repo.continuum.io/miniconda/
-MD5SUM="0c28787e3126238df24c5d4858bd0744"
+MD5SUM="a946ea1d0c4a642ddf0c3a26a18bb16d"
 
 if ! echo "${MD5SUM}  ${INSTALLER_PATH}" | md5sum  --quiet -c -; then
     echo "md5sum mismatch for ${INSTALLER_PATH}, exiting!"
@@ -29,6 +30,9 @@ conda config --system --add channels conda-forge
 conda config --system --set auto_update_conda false
 conda config --system --set show_channel_urls true
 
+# install conda itself
+conda install -yq conda==${CONDA_VERSION}
+
 # switch Python in its own step
 # since switching Python during an env update can
 # prevent pip installation.