From a76955723694f6d92549ef51807d57c411464d41 Mon Sep 17 00:00:00 2001
From: Chris Markiewicz <markiewicz@stanford.edu>
Date: Wed, 10 Feb 2021 14:57:23 -0500
Subject: [PATCH 1/2] MNT: Update Docker pins for Python packages

---
 Dockerfile | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2cb0c3a01..b997a46bb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -125,17 +125,18 @@ ENV PATH="/usr/local/miniconda/bin:$PATH" \
     PYTHONNOUSERSITE=1
 
 # Installing precomputed python packages
-RUN conda install -y python=3.7.1 \
-                     pip=19.1 \
-                     mkl=2018.0.3 \
+RUN conda install -y python=3.7.9 \
+                     pip=20.3 \
+                     mkl=2020.2 \
                      mkl-service \
-                     numpy=1.15.4 \
-                     scipy=1.1.0 \
-                     scikit-learn=0.19.1 \
-                     matplotlib=2.2.2 \
-                     pandas=0.23.4 \
-                     libxml2=2.9.8 \
-                     libxslt=1.1.32 \
+                     numpy=1.19.2 \
+                     scipy=1.5.2 \
+                     scikit-learn=0.23.2 \
+                     scikit-image=0.17.2 \
+                     matplotlib=3.3.2 \
+                     pandas=1.2.1 \
+                     libxml2=2.9.10 \
+                     libxslt=1.1.34 \
                      graphviz=2.40.1 \
                      traits=4.6.0 \
                      zlib; sync && \

From 19b1ef6e9f73cc55672212a5eedd1b62cf68ec0a Mon Sep 17 00:00:00 2001
From: Chris Markiewicz <markiewicz@stanford.edu>
Date: Wed, 10 Feb 2021 15:27:39 -0500
Subject: [PATCH 2/2] MNT: Install graphviz from apt, not conda

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b997a46bb..3c4cb4ac8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,8 @@ RUN apt-get update && \
                     autoconf \
                     libtool \
                     pkg-config \
-                    git && \
+                    git \
+                    graphviz && \
     curl -sSL https://deb.nodesource.com/setup_10.x | bash - && \
     apt-get install -y --no-install-recommends \
                     nodejs && \
@@ -137,7 +138,6 @@ RUN conda install -y python=3.7.9 \
                      pandas=1.2.1 \
                      libxml2=2.9.10 \
                      libxslt=1.1.34 \
-                     graphviz=2.40.1 \
                      traits=4.6.0 \
                      zlib; sync && \
     chmod -R a+rX /usr/local/miniconda; sync && \