##// END OF EJS Templates
Update LICENCE and Copying to match....
Matthias Bussonnier -
r24268:5a6ef3e3
parent child
Show More
@@ -15,9 +15,10 before_install:
15 install:
15 install:
16 - pip install setuptools pip --upgrade
16 - pip install setuptools pip --upgrade
17 - pip install -e file://$PWD#egg=ipython[test] --upgrade
17 - pip install -e file://$PWD#egg=ipython[test] --upgrade
18 - pip install codecov --upgrade
18 - pip install codecov check-manifest --upgrade
19 - sudo apt-get install graphviz
19 - sudo apt-get install graphviz
20 script:
20 script:
21 - check-manifest
21 - cd /tmp && iptest --coverage xml && cd -
22 - cd /tmp && iptest --coverage xml && cd -
22 # On the latest Python only, make sure that the docs build.
23 # On the latest Python only, make sure that the docs build.
23 - |
24 - |
@@ -3,39 +3,8
3 =============================
3 =============================
4
4
5 IPython is licensed under the terms of the Modified BSD License (also known as
5 IPython is licensed under the terms of the Modified BSD License (also known as
6 New or Revised or 3-Clause BSD), as follows:
6 New or Revised or 3-Clause BSD), See LICENSE file:
7
7
8 - Copyright (c) 2008-2014, IPython Development Team
9 - Copyright (c) 2001-2007, Fernando Perez <fernando.perez@colorado.edu>
10 - Copyright (c) 2001, Janko Hauser <jhauser@zscout.de>
11 - Copyright (c) 2001, Nathaniel Gray <n8gray@caltech.edu>
12
13 All rights reserved.
14
15 Redistribution and use in source and binary forms, with or without
16 modification, are permitted provided that the following conditions are met:
17
18 Redistributions of source code must retain the above copyright notice, this
19 list of conditions and the following disclaimer.
20
21 Redistributions in binary form must reproduce the above copyright notice, this
22 list of conditions and the following disclaimer in the documentation and/or
23 other materials provided with the distribution.
24
25 Neither the name of the IPython Development Team nor the names of its
26 contributors may be used to endorse or promote products derived from this
27 software without specific prior written permission.
28
29 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
30 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
31 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
32 DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
33 FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
34 DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
35 SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
36 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
37 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
38 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
39
8
40 About the IPython Development Team
9 About the IPython Development Team
41 ----------------------------------
10 ----------------------------------
@@ -45,9 +14,7 Fernando Perez began IPython in 2001 based on code from Janko Hauser
45 the project lead.
14 the project lead.
46
15
47 The IPython Development Team is the set of all contributors to the IPython
16 The IPython Development Team is the set of all contributors to the IPython
48 project. This includes all of the IPython subprojects. A full list with
17 project. This includes all of the IPython subprojects.
49 details is kept in the documentation directory, in the file
50 ``about/credits.txt``.
51
18
52 The core team that coordinates development on GitHub can be found here:
19 The core team that coordinates development on GitHub can be found here:
53 https://github.com/ipython/.
20 https://github.com/ipython/.
@@ -1,6 +1,10
1 BSD 3-Clause License
1 BSD 3-Clause License
2
2
3 Copyright (c) 2017, Project Jupyter Contributors
3 - Copyright (c) 2008-Present, IPython Development Team
4 - Copyright (c) 2001-2007, Fernando Perez <fernando.perez@colorado.edu>
5 - Copyright (c) 2001, Janko Hauser <jhauser@zscout.de>
6 - Copyright (c) 2001, Nathaniel Gray <n8gray@caltech.edu>
7
4 All rights reserved.
8 All rights reserved.
5
9
6 Redistribution and use in source and binary forms, with or without
10 Redistribution and use in source and binary forms, with or without
@@ -1,7 +1,15
1 include README.rst
1 include README.rst
2 include COPYING.rst
2 include COPYING.rst
3 include LICENSE
3 include setupbase.py
4 include setupbase.py
4 include setupegg.py
5 include setupegg.py
6 include MANIFEST.in
7 include tox.ini
8 include .mailmap
9
10 recursive-exclude tools *
11 exclude tools
12 exclude CONTRIBUTING.md
5
13
6 graft setupext
14 graft setupext
7
15
@@ -29,6 +37,7 prune docs/dist
29 # Patterns to exclude from any directory
37 # Patterns to exclude from any directory
30 global-exclude *~
38 global-exclude *~
31 global-exclude *.flc
39 global-exclude *.flc
40 global-exclude *.yml
32 global-exclude *.pyc
41 global-exclude *.pyc
33 global-exclude *.pyo
42 global-exclude *.pyo
34 global-exclude .dircopy.log
43 global-exclude .dircopy.log
General Comments 0
You need to be logged in to leave comments. Login now