Skip to content

Commit b68c8e9

Browse files
committed
Update license in top level and main README
1 parent f12bfad commit b68c8e9

File tree

2 files changed

+27
-28
lines changed

2 files changed

+27
-28
lines changed

LICENSE

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
1-
Copyright (C) 2011 Jeffrey Whitaker
1+
Copyright (c) 2011 Jeffrey Whitaker
22

3-
Permission to use, copy, modify, and distribute this software and its
4-
documentation for any purpose and without fee is hereby granted,
5-
provided that the above copyright notices appear in all copies and that
6-
both the copyright notices and this permission notice appear in
7-
supporting documentation.
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:
810

9-
THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
10-
INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
11-
EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, INDIRECT OR
12-
CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
13-
USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
14-
OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
15-
PERFORMANCE OF THIS SOFTWARE.
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.

README.md

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -73,29 +73,21 @@ python -m pip install --user git+https://github.com/matplotlib/basemap.git
7373

7474
The source code and data assets are under the following licenses:
7575

76-
* `basemap`:
77-
* [HPND]: Python source code and Python wrapper for GEOS.
78-
* [LGPL-2.1-only]: GEOS source code and dynamic library.
79-
* `basemap-data`:
80-
* [GPL-2.0-or-later]: land-sea mask, coastline, lake, river and
81-
political boundary data derived from GMT.
82-
* [MIT]: EPSG file.
83-
* [HPND]: remaining data files.
84-
* `basemap-data-hires`:
85-
* [GPL-2.0-or-later]: land-sea mask, coastline, lake, river and
86-
political boundary data derived from GMT.
76+
* `basemap`: [MIT].
77+
* GEOS source code and dynamic library are under the [LGPL-2.1-only] license.
78+
* `basemap-data`: [LGPL-3.0-or-later].
79+
* The EPSG file and the JPG images are also under the [MIT] license.
80+
* `basemap-data-hires`: [LGPL-3.0-or-later].
8781

8882
For a full description, please visit the README and LICENSE files of
8983
each package in the corresponding package folders.
9084

9185
[MIT]:
9286
https://spdx.org/licenses/MIT.html
93-
[HPND]:
94-
https://spdx.org/licenses/HPND.html
9587
[LGPL-2.1-only]:
9688
https://spdx.org/licenses/LGPL-2.1-only.html
97-
[GPL-2.0-or-later]:
98-
https://spdx.org/licenses/GPL-2.0-or-later.html
89+
[LGPL-3.0-or-later]:
90+
https://spdx.org/licenses/LGPL-3.0-or-later.html
9991

10092
## Documentation
10193

@@ -110,6 +102,8 @@ problems or questions.
110102

111103
112104

105+
Víctor Molina García ([@molinav](https://github.com/molinav))
106+
113107
## Thanks
114108

115109
Special thanks to John Hunter, Andrew Straw, Eric Firing, Rob Hetland,

0 commit comments

Comments
 (0)