Skip to content

Commit 2fe3197

Browse files
committed
update: license info
1 parent 238fec1 commit 2fe3197

File tree

2 files changed

+19
-34
lines changed

2 files changed

+19
-34
lines changed

LICENSE

+11-26
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,15 @@
1-
Copyright (c) 2009-2014, NIPY Developers
2-
All rights reserved.
1+
Copyright (c) 2009-2016, Nipype developers
32

4-
Redistribution and use in source and binary forms, with or without
5-
modification, are permitted provided that the following conditions are
6-
met:
3+
Licensed under the Apache License, Version 2.0 (the "License");
4+
you may not use this file except in compliance with the License.
5+
You may obtain a copy of the License at
76

8-
* Redistributions of source code must retain the above copyright
9-
notice, this list of conditions and the following disclaimer.
7+
http://www.apache.org/licenses/LICENSE-2.0
108

11-
* Redistributions in binary form must reproduce the above
12-
copyright notice, this list of conditions and the following
13-
disclaimer in the documentation and/or other materials provided
14-
with the distribution.
9+
Unless required by applicable law or agreed to in writing, software
10+
distributed under the License is distributed on an "AS IS" BASIS,
11+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
See the License for the specific language governing permissions and
13+
limitations under the License.
1514

16-
* Neither the name of the NIPY Developers nor the names of any
17-
contributors may be used to endorse or promote products derived
18-
from this software without specific prior written permission.
19-
20-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
21-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
22-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
23-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
24-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
25-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
26-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
27-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
28-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
29-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
30-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
15+
Prior to release 0.12, Nipype was licensed under a BSD license.

nipype/info.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def get_nipype_gitversion():
5656
CLASSIFIERS = ["Development Status :: 5 - Production/Stable",
5757
"Environment :: Console",
5858
"Intended Audience :: Science/Research",
59-
"License :: OSI Approved :: BSD License",
59+
"License :: OSI Approved :: Apache Software License",
6060
"Operating System :: MacOS :: MacOS X",
6161
"Operating System :: POSIX :: Linux",
6262
"Programming Language :: Python :: 2.7",
@@ -85,12 +85,12 @@ def get_nipype_gitversion():
8585
to existing neuroimaging software and facilitates interaction between
8686
these packages within a single workflow. Nipype provides an environment
8787
that encourages interactive exploration of algorithms from different
88-
packages (e.g., ANTS, SPM, FSL, FreeSurfer, Camino, MRtrix, MNE, AFNI, BRAINS,
89-
Slicer), eases the design of workflows within and between packages, and
90-
reduces the learning curve necessary to use different packages. Nipype is
91-
creating a collaborative platform for neuroimaging software development
92-
in a high-level language and addressing limitations of existing pipeline
93-
systems.
88+
packages (e.g., AFNI, ANTS, BRAINS, BrainSuite, Camino, FreeSurfer, FSL, MNE,
89+
MRtrix, MNE, Nipy, Slicer, SPM), eases the design of workflows within and
90+
between packages, and reduces the learning curve necessary to use different
91+
packages. Nipype is creating a collaborative platform for neuroimaging software
92+
development in a high-level language and addressing limitations of existing
93+
pipeline systems.
9494
9595
*Nipype* allows you to:
9696
@@ -121,7 +121,7 @@ def get_nipype_gitversion():
121121
LONG_DESCRIPTION = long_description
122122
URL = "http://nipy.org/nipype"
123123
DOWNLOAD_URL = "http://github.com/nipy/nipype/archives/master"
124-
LICENSE = "BSD license"
124+
LICENSE = "Apache License, 2.0"
125125
CLASSIFIERS = CLASSIFIERS
126126
AUTHOR = "nipype developers"
127127
AUTHOR_EMAIL = "[email protected]"

0 commit comments

Comments
 (0)