Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/developing/documenting.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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/

Expand Down
2 changes: 1 addition & 1 deletion doc/install/development.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion doc/install/installing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion support/setup/installing.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion support/setup/testing.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading