Merge pull request #87 from spacetelescope/0.9.10.x

Prepping for 0.9.10 release

Author: pllim

LICENSE.md

@@ -0,0 +1,29 @@
+BSD 3-Clause License
+
+Copyright (c) 2018, Space Telescope Science Institute, AURA
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

MANIFEST.in

@@ -1,8 +1,12 @@
 include README.rst
+include LICENSE.md
 
 include RELIC-INFO
 
 recursive-include doc *
+recursive-include relic *
+prune relic/.git
+prune relic/tests
 
 prune build
 prune doc/build

doc/source/tutorials.rst

@@ -158,7 +158,8 @@ by the extinction curve:
 Redshift the reddened spectrum above by :math:`z = 0.23`. Then, check that the
 peak wavelength is indeed redder:
 
->>> sp2 = sp1.redshift(0.23)
+>>> sp2 = sp1.redshift(0.23)  # sp2 is in PHOTLAM
+>>> sp2.convert('flam')
 >>> sp1.wave[sp1.flux == max(sp1.flux)][0]
 5026.7534
 >>> sp2.wave[sp2.flux == max(sp2.flux)][0]