diff --git a/doc/developing/documenting.rst b/doc/developing/documenting.rst index aadfd3e69d..29d48257bd 100644 --- a/doc/developing/documenting.rst +++ b/doc/developing/documenting.rst @@ -14,7 +14,7 @@ It's easiest to install the required packages using Conda: .. code-block:: bash - conda install jupyter sphinx make numpy sphinx_rtd_theme matplotlib rst2pdf + conda install -c conda-forge --override-channels jupyter sphinx make numpy sphinx_rtd_theme matplotlib rst2pdf .. _Sphinx: http://www.sphinx-doc.org/en/master/ diff --git a/doc/install/development.rst b/doc/install/development.rst index ee530cae61..c48e181192 100644 --- a/doc/install/development.rst +++ b/doc/install/development.rst @@ -16,7 +16,7 @@ available from every popular package manager. In your Conda environment, .. code-block:: bash - conda install git + conda install -c conda-forge --override-channels git will get you sorted. Next, you can get a local git repository with AMUSE in it using diff --git a/doc/install/installing.rst b/doc/install/installing.rst index 2251337f8a..118cce7daa 100644 --- a/doc/install/installing.rst +++ b/doc/install/installing.rst @@ -194,7 +194,7 @@ well. Fortunately, ``conda`` can help us here too: .. code-block:: bash - conda install scipy astropy jupyter pandas seaborn matplotlib + conda install -c conda-forge --override-channels scipy astropy jupyter pandas seaborn matplotlib Fixing MPI on Ubuntu diff --git a/support/setup/installing.sh b/support/setup/installing.sh index 102f6f05cf..b11933c2f2 100644 --- a/support/setup/installing.sh +++ b/support/setup/installing.sh @@ -83,7 +83,7 @@ install_framework() { fi done if [ -n "${to_install}" ] ; then - conda install -y ${to_install} + conda install -c conda-forge --override-channels -y ${to_install} fi fi diff --git a/support/setup/testing.sh b/support/setup/testing.sh index c948145ea7..d47990b251 100644 --- a/support/setup/testing.sh +++ b/support/setup/testing.sh @@ -7,7 +7,7 @@ ensure_pytest() { printf '%s\n\n' "Please activate a conda environment or virtual environment first." elif [ "a${ENV_TYPE}" = "aconda" ] ; then printf '\n%s\n' "Please use" - printf '\n %b\n' "conda install pytest" + printf '\n %b\n' "conda install -c conda-forge --override-channels pytest" printf '\n%s\n\n' "to install pytest, then try again." else printf '\n%s\n' "Please use"