diff --git a/README.rst b/README.rst index e36dfe434..754947989 100644 --- a/README.rst +++ b/README.rst @@ -14,17 +14,20 @@ The code is publicly available at https://github.com/astropy/halotools. Installation ------------- -The simplest way to install the latest release of the code is with conda-forge:: +The simplest and most reliable way to install the latest release of the code is with conda-forge:: conda install -c conda-forge halotools -Or alternatively, you can install using pip:: +Pip installation is not recommended because the conda-forge dependency solver is much more robust. +However, users who prefer pip can install via:: pip install halotools -You can find detailed installation instructions -in the **Package Installation** section of http://halotools.readthedocs.io. After installing the package, you should navigate to the *Quickstart Guides and Tutorials* section and follow the *Getting started with Halotools* 10-minute tutorial. This will get you set up with the default halo catalog so that you can quickly get started with creating mock galaxy populations. +You can find detailed installation instructions `halotools.readthedocs.io `_. +After installing the package, you should navigate to the *Quickstart Guides and Tutorials* +section and follow the *Getting started with Halotools* 10-minute tutorial. +This will get you set up with the default halo catalog so that you can quickly get started with creating mock galaxy populations. Documentation ------------- diff --git a/docs/install.rst b/docs/install.rst index fc0e3cc2c..7cf13bfef 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -4,18 +4,19 @@ Package Installation ************************ -To install Halotools, you can use conda-forge, pip, or clone the repo from GitHub and build the source code. +To install Halotools, you can use conda-forge (recommended), pip, or clone the repo from GitHub and build the source code. Either way, be sure to read the :ref:`halotools_dependencies` section prior to installation. Using conda-forge and pip ========================= -The simplest way to install the latest release of the code is with conda-forge. +The simplest and most reliable way to install the latest release of the code is with conda-forge. If you will be :ref:`installing_halotools_with_virtualenv`, activate the environment before installing:: conda install -c conda-forge halotools -Alternatively, you can install using pip:: +Pip installation is not recommended because the conda-forge dependency solver is much more robust. +However, users who prefer pip can install via:: pip install halotools diff --git a/halotools/sim_manager/tests/test_download_manager.py b/halotools/sim_manager/tests/test_download_manager.py index 5ca688482..e620f4bd2 100644 --- a/halotools/sim_manager/tests/test_download_manager.py +++ b/halotools/sim_manager/tests/test_download_manager.py @@ -519,6 +519,7 @@ def test_download_ptcl_table3(self): substr = "you must set the ``overwrite`` keyword argument to True." assert substr in err.value.args[0] + @pytest.mark.skipif("not APH_MACHINE") def test_download_ptcl_table4(self): """ """ with pytest.raises(HalotoolsError) as err: