Merge f00868b into e6766e5

spacetelescope · Nov 14, 2018 · fc93e5c · fc93e5c
2 parents e6766e5 + f00868b
commit fc93e5c
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/CITATION b/CITATION
@@ -0,0 +1,4 @@
+To reference synphot in publications, please cite the following:
+
+Lim, P. L., et al. 2016, synphot User's Guide (Baltimore, MD: STScI),
+http://synphot.readthedocs.io/en/latest/
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,6 +1,7 @@
 include README.rst
 include CHANGES.rst
 include LICENSE.rst
+include CITATION
 
 include ez_setup.py
 include ah_bootstrap.py

diff --git a/docs/index.rst b/docs/index.rst
@@ -39,13 +39,13 @@ allows you to:
 * Perform repetitive operations such as simulating the observations of multiple
   type of sources through multiple bandpasses.
 
-If you use **synphot** in your work, please cite it as,
-"*Lim, P. L., et al. 2016, synphot User's Guide
-(Baltimore, MD: STScI), http://synphot.readthedocs.io/en/latest/*"
+If you use **synphot** in your work, please see
+`CITATION <https://github.com/spacetelescope/synphot_refactor/blob/master/CITATION>`_
+for details on how to cite it in your publications.
 
 If you have questions or concerns regarding the software, please open an issue
 at https://github.com/spacetelescope/synphot_refactor/issues (if not already
-reported) or contact STScI Help Desk via ``help[at]stsci.edu``.
+reported) or contact `STScI Help Desk <https://hsthelp.stsci.edu>`_.
 
 
 .. _synphot-installation-setup:

diff --git a/docs/synphot/from_pysyn_iraf.rst b/docs/synphot/from_pysyn_iraf.rst
@@ -11,7 +11,8 @@ all-inclusive; Therefore, not all legacy commands are listed here.
 This is because a legacy command can be reproduced in several different ways
 using **synphot** or has no equivalent implementation.
 Naming convention used is the same as :ref:`synphot-quick-guide`
-Please contact ``help[at]stsci.edu`` if you have any questions.
+Please contact `STScI Help Desk <https://hsthelp.stsci.edu>`_ if you have
+any questions.
 
 
 .. _synphot-pysyn-switcher:

diff --git a/setup.cfg b/setup.cfg
@@ -48,5 +48,6 @@ fail_message =
 # Ignoring these for now:
 # I100: import statements are in the wrong order
 # I201: Missing newline before sections or imports
-ignore = I100, I201
-exclude = synphot/__init__.py,conftest.py,six.py
+# W504: line break after binary operator
+ignore = I100,I201,W504
+exclude = synphot/__init__.py,conftest.py,six.py