Skip to content

Commit 8e08e79

Browse files
committed
Updated license file contents to be recognized by Github. The license itself did not change.
1 parent cdc4dc7 commit 8e08e79

File tree

3 files changed

+39
-56
lines changed

3 files changed

+39
-56
lines changed

LICENSE

+21-42
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,29 @@
1-
Copyright (c) 2017 Maykin Media BV. All Rights Reserved.
1+
BSD 3-Clause License
22

3-
django_dbcache_fields is licensed under The BSD License (3 Clause, also known
4-
as the new BSD license). The license is an OSI approved Open Source
5-
license and is GPL-compatible(1).
6-
7-
The license text can also be found here:
8-
http://www.opensource.org/licenses/BSD-3-Clause
9-
10-
License
11-
=======
3+
Copyright (c) 2017, Maykin Media BV
4+
All rights reserved.
125

136
Redistribution and use in source and binary forms, with or without
147
modification, are permitted provided that the following conditions are met:
15-
* Redistributions of source code must retain the above copyright
16-
notice, this list of conditions and the following disclaimer.
17-
* Redistributions in binary form must reproduce the above copyright
18-
notice, this list of conditions and the following disclaimer in the
19-
documentation and/or other materials provided with the distribution.
20-
* Neither the name of Ask Solem nor the
21-
names of its contributors may be used to endorse or promote products
22-
derived from this software without specific prior written permission.
238

24-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
25-
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
26-
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
27-
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL Ask Solem OR CONTRIBUTORS
28-
BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
29-
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
30-
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
31-
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
32-
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
33-
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
34-
POSSIBILITY OF SUCH DAMAGE.
9+
* Redistributions of source code must retain the above copyright notice, this
10+
list of conditions and the following disclaimer.
3511

36-
Documentation License
37-
=====================
12+
* 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.
3815

39-
The documentation portion of django_dbcache_fields (the rendered contents of
40-
the "docs" directory of a software distribution or checkout) is supplied under
41-
the "Creative Commons Attribution-ShareAlike 4.0 International" (CC BY-SA 4.0)
42-
License as described by http://creativecommons.org/licenses/by-sa/4.0/
16+
* 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.
4319

44-
Footnotes
45-
=========
46-
(1) A GPL-compatible license makes it possible to combine django_dbcache_fields
47-
with other software that is released under the GPL, it does not mean that
48-
we're distributing django_dbcache_fields under the GPL license. The BSD
49-
license, unlike the GPL, let you distribute a modified version without
50-
making your changes open source.
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.

README.rst

+7-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Django DBCache Fields
88
:Source: https://github.com/maykinmedia/django-dbcache-fields
99
:Keywords: django, database, cache, methods, decorator
1010

11-
|build-status| |coverage| |license| |pyversion| |djversion|
11+
|build-status| |coverage| |lintly| |license| |pyversion| |djversion|
1212

1313
About
1414
=====
@@ -100,14 +100,18 @@ need to perform the same query over and over again.
100100
.. |coverage| image:: https://codecov.io/github/maykinmedia/django-dbcache-fields/coverage.svg?branch=master
101101
:target: https://codecov.io/github/maykinmedia/django-dbcache-fields?branch=master
102102

103+
.. |lintly| image:: https://lintly.com/gh/maykinmedia/django-dbcache-fields/badge.svg
104+
:target: https://lintly.com/gh/maykinmedia/django-dbcache-fields/
105+
:alt: Lintly
106+
103107
.. |license| image:: https://img.shields.io/pypi/l/django-dbcache-fields.svg
104108
:alt: BSD License
105109
:target: https://opensource.org/licenses/BSD-3-Clause
106110

107111
.. |pyversion| image:: https://img.shields.io/pypi/pyversions/django-dbcache-fields.svg
108112
:alt: Supported Python versions
109-
:target: http://pypi.python.org/pypi/django_dbcache_fields/
113+
:target: http://pypi.python.org/pypi/django-dbcache-fields/
110114

111115
.. |djversion| image:: https://img.shields.io/badge/django-1.8%2C%201.9%2C%201.10%2C%201.11-blue.svg
112116
:alt: Supported Django versions
113-
:target: http://pypi.python.org/pypi/django_dbcache_fields/
117+
:target: http://pypi.python.org/pypi/django-dbcache-fields/

docs/copyright.rst

+11-11
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,22 @@ by Joeri Bekker
88

99
.. |copy| unicode:: U+000A9 .. COPYRIGHT SIGN
1010

11-
Copyright |copy| 2017, Maykin Media
11+
Copyright |copy| 2017, Maykin Media BV
1212

13-
All rights reserved. This material may be copied or distributed only
14-
subject to the terms and conditions set forth in the `Creative Commons
13+
All rights reserved. This material may be copied or distributed only subject
14+
to the terms and conditions set forth in the `Creative Commons
1515
Attribution-ShareAlike 4.0 International
1616
<https://creativecommons.org/licenses/by-sa/4.0/legalcode>`_ license.
1717

18-
You may share and adapt the material, even for commercial purposes, but
19-
you must give the original author credit.
20-
If you alter, transform, or build upon this
21-
work, you may distribute the resulting work only under the same license or
22-
a license compatible to this one.
18+
You may share and adapt the material, even for commercial purposes, but you
19+
must give the original author credit.
20+
If you alter, transform, or build upon this work, you may distribute the
21+
resulting work only under the same license or a license compatible to this
22+
one.
2323

2424
.. note::
2525

26-
While the django_dbcache_fields *documentation* is offered under the
27-
Creative Commons *Attribution-ShareAlike 4.0 International* license
28-
the django_dbcache_fields *software* is offered under the
26+
While the *documentation* of this package is offered under the Creative
27+
Commons *Attribution-ShareAlike 4.0 International* license *software* of
28+
this package is offered under the
2929
`BSD License (3 Clause) <https://opensource.org/licenses/BSD-3-Clause>`_

0 commit comments

Comments
 (0)