Merge f3adb2b into c480661

karllark · Sep 5, 2019 · 186129b · 186129b
2 parents c480661 + f3adb2b
commit 186129b
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 14 deletions.
diff --git a/docs/dust_extinction/install.rst b/docs/dust_extinction/install.rst
@@ -13,7 +13,7 @@ python fashion after downloading it from the git repo::
 Using pip
 =========
 
-``dust_extinction`` can also be installed using pip::
+``dust_extinction`` can be installed using pip::
 
     # from PyPI
     pip install dust_extinction
@@ -24,3 +24,10 @@ Using pip
     # from the master trunk on the repository, considered developmental code
     pip install git+https://github.com/karllark/dust_extinction.git
 
+Using conda
+===========
+
+``dust_extinction`` can be installed using conda via the conda-forge channel::
+
+    conda config --add channels conda-forge
+    conda install dust_extinction
diff --git a/docs/dust_extinction/reference_api.rst b/docs/dust_extinction/reference_api.rst
@@ -0,0 +1,18 @@
+Reference/API
+=============
+
+Models
+******
+
+.. automodapi:: dust_extinction.averages
+
+.. automodapi:: dust_extinction.parameter_averages
+
+.. automodapi:: dust_extinction.shapes
+
+Details
+*******
+
+.. automodapi:: dust_extinction.conversions
+
+.. automodapi:: dust_extinction.baseclasses
diff --git a/docs/index.rst b/docs/index.rst
@@ -172,12 +172,7 @@ contributors page on Github
 Reference API
 =============
 
-.. automodapi:: dust_extinction.averages
-
-.. automodapi:: dust_extinction.parameter_averages
-
-.. automodapi:: dust_extinction.shapes
-
-.. automodapi:: dust_extinction.conversions
+.. toctree::
+   :maxdepth: 2
 
-.. automodapi:: dust_extinction.baseclasses
+   dust_extinction/reference_api.rst
diff --git a/dust_extinction/__init__.py b/dust_extinction/__init__.py
@@ -3,7 +3,8 @@
 # Packages may add whatever they like to this file, but
 # should keep this content at the top.
 # ----------------------------------------------------------------------------
-from ._astropy_init import *   # noqa
+from ._astropy_init import *  # noqa
+
 # ----------------------------------------------------------------------------
 
 # Enforce Python version check during package import.
@@ -20,10 +21,15 @@ class UnsupportedPythonError(Exception):
     pass
 
 
-if LooseVersion(sys.version) < LooseVersion(__minimum_python_version__):
-    raise UnsupportedPythonError("dust_extinction does not support Python < {}"
-                                 .format(__minimum_python_version__))
+if LooseVersion(sys.version) < LooseVersion(
+    __minimum_python_version__
+):  # pragma: no cover
+    raise UnsupportedPythonError(
+        "dust_extinction does not support Python < {}".format(
+            __minimum_python_version__
+        )
+    )
 
-if not _ASTROPY_SETUP_:   # noqa
+if not _ASTROPY_SETUP_:  # noqa
     # For egg_info test builds to pass, put package imports here.
     pass