Skip to content

Commit 2f2dd95

Browse files
committed
Switch lincense to BSD
1 parent f885c25 commit 2f2dd95

File tree

2 files changed

+29
-14
lines changed

2 files changed

+29
-14
lines changed

LICENSE

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,29 @@
1-
ISC License
1+
BSD 3-Clause License
22

33
Copyright (c) 2018, Johannes Hoppe
4+
All rights reserved.
45

5-
Permission to use, copy, modify, and/or distribute this software for any
6-
purpose with or without fee is hereby granted, provided that the above
7-
copyright notice and this permission notice appear in all copies.
8-
9-
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10-
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11-
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12-
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13-
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14-
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15-
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
6+
Redistribution and use in source and binary forms, with or without
7+
modification, are permitted provided that the following conditions are met:
8+
9+
1. Redistributions of source code must retain the above copyright notice, this
10+
list of conditions and the following disclaimer.
11+
12+
2. Redistributions in binary form must reproduce the above copyright notice,
13+
this list of conditions and the following disclaimer in the documentation
14+
and/or other materials provided with the distribution.
15+
16+
3. Neither the name of the copyright holder nor the names of its
17+
contributors may be used to endorse or promote products derived from
18+
this software without specific prior written permission.
19+
20+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
21+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
23+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
24+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
25+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
26+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
27+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
28+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

setup.cfg

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ long_description = file: README.md
55
long_description_content_type = text/markdown; charset=UTF-8
66
author = Johannes Hoppe
77
author-email = [email protected]
8-
license = Apache-2
8+
license = BSD
99
home-page = https://github.com/codingjoe/galahad
1010
# Find more classifiers here:
1111
# https://pypi.org/pypi?%3Aaction=list_classifiers
@@ -15,7 +15,8 @@ classifier =
1515
Framework :: Django :: 2.0
1616
Framework :: Django :: 2.1
1717
Environment :: Web Environment
18-
License :: OSI Approved :: ISC License (ISCL)
18+
License :: OSI Approved :: BSD License
19+
Operating System :: OS Independent
1920
Programming Language :: Python :: 3
2021
Programming Language :: Python :: 3.5
2122
Programming Language :: Python :: 3.6

0 commit comments

Comments
 (0)