From ba7b08c9fab1874f438dd0cccde061a04ee30b7e Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Fri, 13 Nov 2020 14:33:20 -0600 Subject: [PATCH 1/2] Switch install docs to miniforge --- doc/misc.rst | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/doc/misc.rst b/doc/misc.rst index 58972997..c8e0733e 100644 --- a/doc/misc.rst +++ b/doc/misc.rst @@ -16,21 +16,19 @@ This set of instructions is intended for 64-bit Linux and macOS computers. Everywhere else, just making sure you have the ``g++`` package should be enough. -#. Install your favorite variant of `miniconda `_. +#. Install your favorite variant of `miniforge `_. (Both Python 2 and 3 should work. In the absence of other constraints, prefer Python 3.) -#. ``export CONDA=/WHERE/YOU/INSTALLED/miniconda3`` +#. ``export CONDA=/WHERE/YOU/INSTALLED/miniforge3`` If you accepted the default location, this should work: - ``export CONDA=$HOME/miniconda3`` + ``export CONDA=$HOME/miniforge3`` #. ``$CONDA/bin/conda create -n inteq`` #. ``source $CONDA/bin/activate inteq`` -#. ``conda config --add channels conda-forge`` - Then, on Linux: #. ``conda install cython git pip pocl islpy pyopencl sympy pyfmmlib pytest`` @@ -59,7 +57,7 @@ And on macOS: Next time you want to use :mod:`pytential`, just run the following command:: - source /WHERE/YOU/INSTALLED/miniconda3/bin/activate inteq + source /WHERE/YOU/INSTALLED/miniforge3/bin/activate inteq You may also like to add this to a startup file (like :file:`$HOME/.bashrc`) or create an alias for it. -- GitLab From 2eaf7ccbfc1f2e119660b07d933a67293413bfb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Fri, 13 Nov 2020 21:34:33 +0100 Subject: [PATCH 2/2] Remove Py2/3 advice from install docs --- doc/misc.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/misc.rst b/doc/misc.rst index c8e0733e..5854134f 100644 --- a/doc/misc.rst +++ b/doc/misc.rst @@ -17,7 +17,6 @@ This set of instructions is intended for 64-bit Linux and macOS computers. enough. #. Install your favorite variant of `miniforge `_. - (Both Python 2 and 3 should work. In the absence of other constraints, prefer Python 3.) #. ``export CONDA=/WHERE/YOU/INSTALLED/miniforge3`` -- GitLab