Skip to content

Commit fa7d347

Browse files
authored
Merge pull request #1235 from LourensVeen/issue_1181_more_force_conda_forge
Force conda-forge installation everywhere
2 parents 93c086b + 7a1969a commit fa7d347

5 files changed

Lines changed: 5 additions & 5 deletions

File tree

doc/developing/documenting.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ It's easiest to install the required packages using Conda:
1414

1515
.. code-block:: bash
1616
17-
conda install jupyter sphinx make numpy sphinx_rtd_theme matplotlib rst2pdf
17+
conda install -c conda-forge --override-channels jupyter sphinx make numpy sphinx_rtd_theme matplotlib rst2pdf
1818
1919
.. _Sphinx: http://www.sphinx-doc.org/en/master/
2020

doc/install/development.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ available from every popular package manager. In your Conda environment,
1616

1717
.. code-block:: bash
1818
19-
conda install git
19+
conda install -c conda-forge --override-channels git
2020
2121
will get you sorted. Next, you can get a local git repository with AMUSE in it using
2222

doc/install/installing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ well. Fortunately, ``conda`` can help us here too:
194194

195195
.. code-block:: bash
196196
197-
conda install scipy astropy jupyter pandas seaborn matplotlib
197+
conda install -c conda-forge --override-channels scipy astropy jupyter pandas seaborn matplotlib
198198
199199
200200
Fixing MPI on Ubuntu

support/setup/installing.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ install_framework() {
8383
fi
8484
done
8585
if [ -n "${to_install}" ] ; then
86-
conda install -y ${to_install}
86+
conda install -c conda-forge --override-channels -y ${to_install}
8787
fi
8888
fi
8989

support/setup/testing.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ensure_pytest() {
77
printf '%s\n\n' "Please activate a conda environment or virtual environment first."
88
elif [ "a${ENV_TYPE}" = "aconda" ] ; then
99
printf '\n%s\n' "Please use"
10-
printf '\n %b\n' "conda install pytest"
10+
printf '\n %b\n' "conda install -c conda-forge --override-channels pytest"
1111
printf '\n%s\n\n' "to install pytest, then try again."
1212
else
1313
printf '\n%s\n' "Please use"

0 commit comments

Comments
 (0)