From 1dea1e47d335eb0ccb3e28d610f9e983800dcd9c Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Tue, 15 Oct 2019 18:48:55 -0500
Subject: [PATCH] Switch over to miniconda3

---
 .gitignore | 4 ++--
 Dockerfile | 2 +-
 README.md  | 2 +-
 install.sh | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index ec946d8..2933d05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,5 @@ __pycache__/
 out/
 src/
 summary/
-.miniconda2/
-Miniconda2-*-x86_64.sh
\ No newline at end of file
+.miniconda3/
+Miniconda3-*-x86_64.sh
diff --git a/Dockerfile b/Dockerfile
index da42580..46c1ced 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,7 +21,7 @@ RUN mkdir /home/inteq/gigaqbx-2d-results
 WORKDIR /home/inteq/gigaqbx-2d-results
 COPY --chown=inteq . .
 RUN ./install.sh \
-    && .miniconda2/bin/conda clean --all --yes
+    && .miniconda3/bin/conda clean --all --yes
 
 # Install extra LaTeX bits
 RUN tlmgr init-usertree \
diff --git a/README.md b/README.md
index 13e3581..be87829 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ For producing figures and outputs, you will also need LaTeX and the
 Before running, activate the Conda environment and instruct PyOpenCL to use
 POCL, as follows:
 ```
-source .miniconda2/bin/activate inteq
+source .miniconda3/bin/activate inteq
 export PYOPENCL_TEST=portable
 ```
 
diff --git a/install.sh b/install.sh
index 5fd91bc..bab99ea 100755
--- a/install.sh
+++ b/install.sh
@@ -5,18 +5,18 @@
 # Find platform
 if [ "$(uname)" = Darwin ] && [ "$(uname -m)" = x86_64 ]
 then
-    MINICONDA_INSTALL_SH=Miniconda2-4.7.10-MacOSX-x86_64.sh
+    MINICONDA_INSTALL_SH=Miniconda3-4.7.10-MacOSX-x86_64.sh
     SPEC_FILE=env/osx-64-spec.txt
 elif [ "$(uname)" = Linux ] && [ "$(uname -m)" = x86_64 ]
 then
-    MINICONDA_INSTALL_SH=Miniconda2-4.7.10-Linux-x86_64.sh
+    MINICONDA_INSTALL_SH=Miniconda3-4.7.10-Linux-x86_64.sh
     SPEC_FILE=env/linux-64-spec.txt
 else
     echo Unsupported platform.
     exit 1
 fi
 
-MINICONDA_INSTALL_DIR=.miniconda2
+MINICONDA_INSTALL_DIR=.miniconda3
 
 if [ -d $MINICONDA_INSTALL_DIR ] && [ -d src ]
 then
-- 
GitLab