Skip to content

Commit a8e6de5

Browse files
molinavmolinav
committed
Update basemap-data license to LGPLv3+ (plus MIT)
1 parent 7fe5a27 commit a8e6de5

File tree

7 files changed

+827
-316
lines changed

7 files changed

+827
-316
lines changed

‎packages/basemap_data/COPYING

Lines changed: 618 additions & 283 deletions
Large diffs are not rendered by default.

‎packages/basemap_data/COPYING.LESSER

Lines changed: 165 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,165 @@
1+
GNU LESSER GENERAL PUBLIC LICENSE
2+
Version 3, 29 June 2007
3+
4+
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
5+
Everyone is permitted to copy and distribute verbatim copies
6+
of this license document, but changing it is not allowed.
7+
8+
9+
This version of the GNU Lesser General Public License incorporates
10+
the terms and conditions of version 3 of the GNU General Public
11+
License, supplemented by the additional permissions listed below.
12+
13+
0. Additional Definitions.
14+
15+
As used herein, "this License" refers to version 3 of the GNU Lesser
16+
General Public License, and the "GNU GPL" refers to version 3 of the GNU
17+
General Public License.
18+
19+
"The Library" refers to a covered work governed by this License,
20+
other than an Application or a Combined Work as defined below.
21+
22+
An "Application" is any work that makes use of an interface provided
23+
by the Library, but which is not otherwise based on the Library.
24+
Defining a subclass of a class defined by the Library is deemed a mode
25+
of using an interface provided by the Library.
26+
27+
A "Combined Work" is a work produced by combining or linking an
28+
Application with the Library. The particular version of the Library
29+
with which the Combined Work was made is also called the "Linked
30+
Version".
31+
32+
The "Minimal Corresponding Source" for a Combined Work means the
33+
Corresponding Source for the Combined Work, excluding any source code
34+
for portions of the Combined Work that, considered in isolation, are
35+
based on the Application, and not on the Linked Version.
36+
37+
The "Corresponding Application Code" for a Combined Work means the
38+
object code and/or source code for the Application, including any data
39+
and utility programs needed for reproducing the Combined Work from the
40+
Application, but excluding the System Libraries of the Combined Work.
41+
42+
1. Exception to Section 3 of the GNU GPL.
43+
44+
You may convey a covered work under sections 3 and 4 of this License
45+
without being bound by section 3 of the GNU GPL.
46+
47+
2. Conveying Modified Versions.
48+
49+
If you modify a copy of the Library, and, in your modifications, a
50+
facility refers to a function or data to be supplied by an Application
51+
that uses the facility (other than as an argument passed when the
52+
facility is invoked), then you may convey a copy of the modified
53+
version:
54+
55+
a) under this License, provided that you make a good faith effort to
56+
ensure that, in the event an Application does not supply the
57+
function or data, the facility still operates, and performs
58+
whatever part of its purpose remains meaningful, or
59+
60+
b) under the GNU GPL, with none of the additional permissions of
61+
this License applicable to that copy.
62+
63+
3. Object Code Incorporating Material from Library Header Files.
64+
65+
The object code form of an Application may incorporate material from
66+
a header file that is part of the Library. You may convey such object
67+
code under terms of your choice, provided that, if the incorporated
68+
material is not limited to numerical parameters, data structure
69+
layouts and accessors, or small macros, inline functions and templates
70+
(ten or fewer lines in length), you do both of the following:
71+
72+
a) Give prominent notice with each copy of the object code that the
73+
Library is used in it and that the Library and its use are
74+
covered by this License.
75+
76+
b) Accompany the object code with a copy of the GNU GPL and this license
77+
document.
78+
79+
4. Combined Works.
80+
81+
You may convey a Combined Work under terms of your choice that,
82+
taken together, effectively do not restrict modification of the
83+
portions of the Library contained in the Combined Work and reverse
84+
engineering for debugging such modifications, if you also do each of
85+
the following:
86+
87+
a) Give prominent notice with each copy of the Combined Work that
88+
the Library is used in it and that the Library and its use are
89+
covered by this License.
90+
91+
b) Accompany the Combined Work with a copy of the GNU GPL and this license
92+
document.
93+
94+
c) For a Combined Work that displays copyright notices during
95+
execution, include the copyright notice for the Library among
96+
these notices, as well as a reference directing the user to the
97+
copies of the GNU GPL and this license document.
98+
99+
d) Do one of the following:
100+
101+
0) Convey the Minimal Corresponding Source under the terms of this
102+
License, and the Corresponding Application Code in a form
103+
suitable for, and under terms that permit, the user to
104+
recombine or relink the Application with a modified version of
105+
the Linked Version to produce a modified Combined Work, in the
106+
manner specified by section 6 of the GNU GPL for conveying
107+
Corresponding Source.
108+
109+
1) Use a suitable shared library mechanism for linking with the
110+
Library. A suitable mechanism is one that (a) uses at run time
111+
a copy of the Library already present on the user's computer
112+
system, and (b) will operate properly with a modified version
113+
of the Library that is interface-compatible with the Linked
114+
Version.
115+
116+
e) Provide Installation Information, but only if you would otherwise
117+
be required to provide such information under section 6 of the
118+
GNU GPL, and only to the extent that such information is
119+
necessary to install and execute a modified version of the
120+
Combined Work produced by recombining or relinking the
121+
Application with a modified version of the Linked Version. (If
122+
you use option 4d0, the Installation Information must accompany
123+
the Minimal Corresponding Source and Corresponding Application
124+
Code. If you use option 4d1, you must provide the Installation
125+
Information in the manner specified by section 6 of the GNU GPL
126+
for conveying Corresponding Source.)
127+
128+
5. Combined Libraries.
129+
130+
You may place library facilities that are a work based on the
131+
Library side by side in a single library together with other library
132+
facilities that are not Applications and are not covered by this
133+
License, and convey such a combined library under terms of your
134+
choice, if you do both of the following:
135+
136+
a) Accompany the combined library with a copy of the same work based
137+
on the Library, uncombined with any other library facilities,
138+
conveyed under the terms of this License.
139+
140+
b) Give prominent notice with the combined library that part of it
141+
is a work based on the Library, and explaining where to find the
142+
accompanying uncombined form of the same work.
143+
144+
6. Revised Versions of the GNU Lesser General Public License.
145+
146+
The Free Software Foundation may publish revised and/or new versions
147+
of the GNU Lesser General Public License from time to time. Such new
148+
versions will be similar in spirit to the present version, but may
149+
differ in detail to address new problems or concerns.
150+
151+
Each version is given a distinguishing version number. If the
152+
Library as you received it specifies that a certain numbered version
153+
of the GNU Lesser General Public License "or any later version"
154+
applies to it, you have the option of following the terms and
155+
conditions either of that published version or of any later version
156+
published by the Free Software Foundation. If the Library as you
157+
received it does not specify a version number of the GNU Lesser
158+
General Public License, you may choose any version of the GNU Lesser
159+
General Public License ever published by the Free Software Foundation.
160+
161+
If the Library as you received it specifies that a proxy can decide
162+
whether future versions of the GNU Lesser General Public License shall
163+
apply, that proxy's public statement of acceptance of any version is
164+
permanent authorization for you to choose that version for the
165+
Library.

‎packages/basemap_data/LICENSE.epsg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ I did the work. Essentially all work was done by Gerald Evenden.
1111

1212
--------------
1313

14-
Copyright (c) 2000, Frank Warmerdam
14+
Copyright (c) 2000 Frank Warmerdam
1515

1616
Permission is hereby granted, free of charge, to any person obtaining a
1717
copy of this software and associated documentation files (the "Software"),

‎packages/basemap_data/LICENSE.hpnd

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎packages/basemap_data/LICENSE.mit

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
Copyright (c) 2011 Jeffrey Whitaker
2+
3+
Permission is hereby granted, free of charge, to any person obtaining
4+
a copy of this software and associated documentation files (the
5+
"Software"), to deal in the Software without restriction, including
6+
without limitation the rights to use, copy, modify, merge, publish,
7+
distribute, sublicense, and/or sell copies of the Software, and to
8+
permit persons to whom the Software is furnished to do so, subject to
9+
the following conditions:
10+
11+
The above copyright notice and this permission notice shall be
12+
included in all copies or substantial portions of the Software.
13+
14+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
15+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
17+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
18+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
19+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
20+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

‎packages/basemap_data/README.md

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,13 @@ python -m pip install basemap-data
1616
## License
1717

1818
The land-sea mask, coastline, lake, river and political boundary data
19-
are extracted from datasets provided with the [Generic Mapping Tools
20-
(GMT)] and are included under the terms given in [`COPYING`].
19+
are extracted from the [GSHHG] datasets (version 2.3.6) using [GMT]
20+
(5.x series) and are included under the terms of the [LGPLv3+] license
21+
(see [`COPYING`] and [`COPYING.LESSER`]).
2122

22-
The EPSG file belongs to the PROJ.4 package and is licensed here under
23-
the [MIT license], as stated in [`LICENSE.epsg`].
24-
25-
Everything else is licensed under the [Historical Permission Notice and
26-
Disclaimer (HPND)], as stated in [`LICENSE.hpnd`].
23+
The other files are included under the terms of the [MIT] license. See
24+
[`LICENSE.epsg`] for the EPSG file (taken from the PROJ.4 package) and
25+
[`LICENSE.mit`] for the rest.
2726

2827

2928
[`matplotlib`]:
@@ -32,15 +31,22 @@ https://matplotlib.org/
3231
https://matplotlib.org/basemap/
3332
[`pip`]:
3433
https://pip.pypa.io/
34+
35+
[GSHHG]:
36+
https://www.soest.hawaii.edu/pwessel/gshhg
37+
[GMT]:
38+
http://gmt.soest.hawaii.edu
39+
40+
[LGPLv3+]:
41+
https://spdx.org/licenses/LGPL-3.0-or-later.html
42+
[MIT]:
43+
https://spdx.org/licenses/MIT.html
44+
3545
[`COPYING`]:
3646
https://github.com/molinav/basemap/blob/develop/packages/basemap_data/COPYING
47+
[`COPYING.LESSER`]:
48+
https://github.com/molinav/basemap/blob/develop/packages/basemap_data_hires/COPYING.LESSER
3749
[`LICENSE.epsg`]:
3850
https://github.com/molinav/basemap/blob/develop/packages/basemap_data/LICENSE.epsg
39-
[`LICENSE.hpnd`]:
40-
https://github.com/molinav/basemap/blob/develop/packages/basemap_data/LICENSE.hpnd
41-
[Generic Mapping Tools (GMT)]:
42-
http://gmt.soest.hawaii.edu
43-
[Historical Permission Notice and Disclaimer (HPND)]:
44-
https://opensource.org/licenses/HPND
45-
[MIT license]:
46-
https://opensource.org/licenses/MIT
51+
[`LICENSE.mit`]:
52+
https://github.com/molinav/basemap/blob/develop/packages/basemap_data/LICENSE.mit

‎packages/basemap_data/setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def get_content(name, splitlines=False):
7777
"version":
7878
"1.3.0a3+dev",
7979
"license":
80-
"GNU General Public License v2 or later (GPLv2+)",
80+
"GNU Lesser General Public License v3 or later (LGPLv3+)",
8181
"description":
8282
"Data assets for matplotlib basemap",
8383
"long_description":
@@ -98,7 +98,7 @@ def get_content(name, splitlines=False):
9898
"Development Status :: 5 - Production/Stable",
9999
"Intended Audience :: Education",
100100
"Intended Audience :: Science/Research",
101-
"License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)",
101+
"License :: OSI Approved :: GNU Lesser General Public License v3 or later (LGPLv3+)",
102102
"Operating System :: OS Independent",
103103
"Programming Language :: Python :: 2",
104104
"Programming Language :: Python :: 3",

0 commit comments

Comments
 (0)