Permalink
Browse files

Add licensing language.

  • Loading branch information...
1 parent f30efa6 commit c2e877dfe30cb52a7239abc3256a07bfbda22b19 @mdboom mdboom committed Sep 11, 2012
Showing with 26 additions and 10 deletions.
  1. +4 −7 astropy/units/__init__.py
  2. +4 −3 docs/units/index.rst
  3. +18 −0 licenses/PYPARSING_LICENSE.rst
View
@@ -1,13 +1,10 @@
"""
Light-weight physical units module.
-This code is adapted from the units code in
-`pynbody <http://code.google.com/p/pynbody/>`_.
-
-The original pynbody has a GPL license. Eventual use of this code with
-astropy will require converting it to the standard astropy license. In
-principle permission has been granted, but that was subject to seeing
-if anyone else had contributed code to units besides Andrew Pontzen.
+This code is adapted from the `pynbody
+<http://code.google.com/p/pynbody/>`_ units module written by Andrew
+Pontzen, who has granted the Astropy project permission to use the
+code under a BSD license.
"""
from .core import *
View
@@ -70,6 +70,7 @@ Reference/API
Acknowledgments
===============
-astropy.units was adopted from the pynbody units module (with a
-multitude of changes; so do not expect it to behave in the same way or
-use the same names).
+This code is adapted from the `pynbody
+<http://code.google.com/p/pynbody/>`_ units module written by Andrew
+Pontzen, who has granted the Astropy project permission to use the
+code under a BSD license.
@@ -0,0 +1,18 @@
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

0 comments on commit c2e877d

Please sign in to comment.