From 5a6ef3e35db9ac04bf47a17d96484e03370f03dd 2018-04-03 15:50:17 From: Matthias Bussonnier Date: 2018-04-03 15:50:17 Subject: [PATCH] Update LICENCE and Copying to match. Test manifest.in for inclusion of all files. --- diff --git a/.travis.yml b/.travis.yml index b97f05c..77bbe82 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,9 +15,10 @@ before_install: install: - pip install setuptools pip --upgrade - pip install -e file://$PWD#egg=ipython[test] --upgrade - - pip install codecov --upgrade + - pip install codecov check-manifest --upgrade - sudo apt-get install graphviz script: + - check-manifest - cd /tmp && iptest --coverage xml && cd - # On the latest Python only, make sure that the docs build. - | diff --git a/COPYING.rst b/COPYING.rst index 59674ac..60ea5ee 100644 --- a/COPYING.rst +++ b/COPYING.rst @@ -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 -- Copyright (c) 2001, Janko Hauser -- Copyright (c) 2001, Nathaniel Gray - -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/. diff --git a/LICENSE b/LICENSE index 0dc8981..d4bb8d3 100644 --- a/LICENSE +++ b/LICENSE @@ -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 +- Copyright (c) 2001, Janko Hauser +- Copyright (c) 2001, Nathaniel Gray + All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/MANIFEST.in b/MANIFEST.in index 29039af..73836e0 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,7 +1,15 @@ include README.rst include COPYING.rst +include LICENSE include setupbase.py include setupegg.py +include MANIFEST.in +include tox.ini +include .mailmap + +recursive-exclude tools * +exclude tools +exclude CONTRIBUTING.md graft setupext @@ -29,6 +37,7 @@ prune docs/dist # Patterns to exclude from any directory global-exclude *~ global-exclude *.flc +global-exclude *.yml global-exclude *.pyc global-exclude *.pyo global-exclude .dircopy.log