forked from ipython/ipython
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update LICENCE and Copying to match.
Test manifest.in for inclusion of all files.
- Loading branch information
Showing
4 changed files
with
18 additions
and
37 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,39 +3,8 @@ | |
============================= | ||
|
||
IPython is licensed under the terms of the Modified BSD License (also known as | ||
New or Revised or 3-Clause BSD), as follows: | ||
New or Revised or 3-Clause BSD), See LICENSE file: | ||
|
||
- Copyright (c) 2008-2014, IPython Development Team | ||
- Copyright (c) 2001-2007, Fernando Perez <[email protected]> | ||
- Copyright (c) 2001, Janko Hauser <[email protected]> | ||
- Copyright (c) 2001, Nathaniel Gray <[email protected]> | ||
|
||
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 IPython Development Team 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 OWNER 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. | ||
|
||
About the IPython Development Team | ||
---------------------------------- | ||
|
@@ -45,9 +14,7 @@ Fernando Perez began IPython in 2001 based on code from Janko Hauser | |
the project lead. | ||
|
||
The IPython Development Team is the set of all contributors to the IPython | ||
project. This includes all of the IPython subprojects. A full list with | ||
details is kept in the documentation directory, in the file | ||
``about/credits.txt``. | ||
project. This includes all of the IPython subprojects. | ||
|
||
The core team that coordinates development on GitHub can be found here: | ||
https://github.com/ipython/. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,10 @@ | ||
BSD 3-Clause License | ||
|
||
Copyright (c) 2017, Project Jupyter Contributors | ||
- Copyright (c) 2008-Present, IPython Development Team | ||
- Copyright (c) 2001-2007, Fernando Perez <[email protected]> | ||
- Copyright (c) 2001, Janko Hauser <[email protected]> | ||
- Copyright (c) 2001, Nathaniel Gray <[email protected]> | ||
|
||
All rights reserved. | ||
|
||
Redistribution and use in source and binary forms, with or without | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters