From 7f17c8bafde457d6d17b862b543dd34a5b504343 Mon Sep 17 00:00:00 2001
From: Wei Ji <weiji.leong@vuw.ac.nz>
Date: Wed, 31 Jul 2019 20:12:50 +1200
Subject: [PATCH 1/3] :arrow_up: Bump conda from 4.6.14 to 4.7.10

Bumps [conda](https://github.com/conda/conda) from 4.6.14 to 4.7.10. Also had to change cudatoolkit to use the 'anaconda' channel instead of 'defaults' for some reason though they are aliases.
- [Release notes](https://github.com/conda/conda/releases)
- [Changelog](https://github.com/conda/conda/blob/master/CHANGELOG.md)
- [Commits](https://github.com/conda/conda/compare/4.6.14...4.7.10)
---
 Dockerfile      | 4 ++--
 environment.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0909686..df0a5cb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,12 +16,12 @@ RUN adduser --disabled-password \
 # Setup conda
 ENV CONDA_DIR ${HOME}/.conda
 ENV NB_PYTHON_PREFIX ${CONDA_DIR}
-ENV MINICONDA_VERSION 4.6.14
+ENV MINICONDA_VERSION 4.7.10
 ENV PATH ${CONDA_DIR}/bin:$HOME/.local/bin:${PATH}
 
 RUN cd /tmp && \
     wget --quiet https://repo.continuum.io/miniconda/Miniconda3-${MINICONDA_VERSION}-Linux-x86_64.sh && \
-    echo "718259965f234088d785cad1fbd7de03 *Miniconda3-${MINICONDA_VERSION}-Linux-x86_64.sh" | md5sum -c - && \
+    echo "1c945f2b3335c7b2b15130b1b2dc5cf4 *Miniconda3-${MINICONDA_VERSION}-Linux-x86_64.sh" | md5sum -c - && \
     /bin/bash Miniconda3-${MINICONDA_VERSION}-Linux-x86_64.sh -f -b -p $CONDA_DIR && \
     rm Miniconda3-${MINICONDA_VERSION}-Linux-x86_64.sh && \
     $CONDA_DIR/bin/conda config --system --prepend channels conda-forge && \
diff --git a/environment.yml b/environment.yml
index 48215b2..134e0eb 100644
--- a/environment.yml
+++ b/environment.yml
@@ -4,7 +4,7 @@ channels:
   - nodefaults
 dependencies:
   - hcc::cuda_driver=410.73[md5=941787b750b372f4a240287634589d24]
-  - defaults::cudatoolkit=10.0[md5=4388ad6015992501b042eea5197eb447]
+  - anaconda::cudatoolkit=10.0[md5=4388ad6015992501b042eea5197eb447]
   - conda-forge/label/dev::gmt=6.0.0rc1[md5=983ab0490b3ea8789136267cd7e7ed02]
   - pip=18.1[md5=d68c7e5109ba0bf4b1cfe60f0f47870a]
   - conda-forge::python=3.6.7[md5=787937284685efaaa233453b49a9e719]

From ab8b22706929e86d0eebf90248f8628d331950ca Mon Sep 17 00:00:00 2001
From: Wei Ji <weiji.leong@vuw.ac.nz>
Date: Wed, 31 Jul 2019 21:12:17 +1200
Subject: [PATCH 2/3] :arrow_up: Bump pip from 18.1 to 19.2.1

Bumps [pip](https://github.com/pypa/pip) from 18.1 to 19.2.1. Can't believe it's been so long since the last update at 56db41aded05f699ededb2e1e46d4d3b02f8f71d!
- [Release notes](https://github.com/pypa/pip/releases/)
- [Changelog](https://github.com/pypa/pip/blob/master/NEWS.rst)
- [Commits](https://github.com/pypa/pip/compare/18.1...19.2.1)
---
 environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/environment.yml b/environment.yml
index 134e0eb..34a3725 100644
--- a/environment.yml
+++ b/environment.yml
@@ -6,7 +6,7 @@ dependencies:
   - hcc::cuda_driver=410.73[md5=941787b750b372f4a240287634589d24]
   - anaconda::cudatoolkit=10.0[md5=4388ad6015992501b042eea5197eb447]
   - conda-forge/label/dev::gmt=6.0.0rc1[md5=983ab0490b3ea8789136267cd7e7ed02]
-  - pip=18.1[md5=d68c7e5109ba0bf4b1cfe60f0f47870a]
+  - conda-forge::pip=19.2.1[md5=95e1564d40edda4b98171de82ceba8ab]
   - conda-forge::python=3.6.7[md5=787937284685efaaa233453b49a9e719]
   - conda-forge::libspatialindex=1.9.0[md5=ef8f25a228de3a0dc716566b8d3de593]
   - pip:

From cad756a0e121ecd5f22b71b8045706ef4f9e7cc4 Mon Sep 17 00:00:00 2001
From: Wei Ji <weiji.leong@vuw.ac.nz>
Date: Wed, 31 Jul 2019 21:37:47 +1200
Subject: [PATCH 3/3] :arrow_up: Bump gmt from 6.0.0rc1 to 6.0.0rc3

Bumps [gmt](https://github.com/GenericMappingTools/gmt) from 6.0.0rc1 to 6.0.0rc3. See also issue documenting this release at https://github.com/GenericMappingTools/gmt/issues/1176.
- [Release notes](https://github.com/GenericMappingTools/gmt/releases)
- [Commits](https://github.com/GenericMappingTools/gmt/compare/6.0.0rc1...6.0.0rc3)
---
 environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/environment.yml b/environment.yml
index 34a3725..f7976e6 100644
--- a/environment.yml
+++ b/environment.yml
@@ -5,7 +5,7 @@ channels:
 dependencies:
   - hcc::cuda_driver=410.73[md5=941787b750b372f4a240287634589d24]
   - anaconda::cudatoolkit=10.0[md5=4388ad6015992501b042eea5197eb447]
-  - conda-forge/label/dev::gmt=6.0.0rc1[md5=983ab0490b3ea8789136267cd7e7ed02]
+  - conda-forge/label/dev::gmt=6.0.0rc3[md5=5dd95d211fff2434e792dac514063721]
   - conda-forge::pip=19.2.1[md5=95e1564d40edda4b98171de82ceba8ab]
   - conda-forge::python=3.6.7[md5=787937284685efaaa233453b49a9e719]
   - conda-forge::libspatialindex=1.9.0[md5=ef8f25a228de3a0dc716566b8d3de593]