Skip to content

Commit b9da1f4

Browse files
committed
Match license text to license='Apache 2.0' in setup.py
1 parent a185a9d commit b9da1f4

File tree

2 files changed

+10
-21
lines changed

2 files changed

+10
-21
lines changed

LICENSE.txt

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,13 @@
11
Copyright 2014 Roland Hedberg. All rights reserved.
22

3-
Redistribution and use in source and binary forms, with or without modification, are
4-
permitted provided that the following conditions are 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
56

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

9-
2. Redistributions in binary form must reproduce the above copyright notice, this list
10-
of conditions and the following disclaimer in the documentation and/or other materials
11-
provided with the distribution.
12-
13-
THIS SOFTWARE IS PROVIDED BY Roland Hedberg ``AS IS'' AND ANY EXPRESS OR IMPLIED
14-
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
15-
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL Roland Hedberg OR
16-
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
17-
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
18-
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
19-
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
20-
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
21-
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
22-
23-
The views and conclusions contained in the software and documentation are those of the
24-
authors and should not be interpreted as representing official policies, either expressed
25-
or implied of their employers.
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.

MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
include INSTALL
2+
include LICENSE.txt
23
include README
34
include TODO
45
recursive-include tests *

0 commit comments

Comments
 (0)