Merge pull request #2133 from jasongrout/copyrightnotice

Clarify license files.
jupyter-widgets · Jul 17, 2018 · a7096ca · a7096ca
2 parents 884e171 + 0e6accc
commit a7096ca
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 63 deletions.
diff --git a/COPYING.md b/COPYING.md
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2015-2016, Project Jupyter Contributors
+Copyright (c) 2015 Project Jupyter Contributors
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,4 +1,4 @@
-include COPYING.md
+include LICENSE
 include CONTRIBUTING.md
 include README.md
 include package.json

diff --git a/widgetsnbextension/LICENSE b/widgetsnbextension/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2015 Project Jupyter Contributors
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. 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.
+
+3. 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.
diff --git a/widgetsnbextension/MANIFEST.in b/widgetsnbextension/MANIFEST.in
@@ -1,3 +1,4 @@
+include LICENSE
 graft widgetsnbextension/static
 graft src
 include package.json

diff --git a/widgetsnbextension/setup.cfg b/widgetsnbextension/setup.cfg
@@ -2,4 +2,4 @@
 universal=1
 
 [metadata]
-license_file = ../LICENSE
+license_file = LICENSE