Update basemap license to MIT

Author: molinav

packages/basemap/LICENSE

@@ -1,15 +1,20 @@
-Copyright (C) 2011 Jeffrey Whitaker
+Copyright (c) 2011 Jeffrey Whitaker
 
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notices appear in all copies and that
-both the copyright notices and this permission notice appear in
-supporting documentation.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
 
-THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
-EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

packages/basemap/README.md

@@ -9,11 +9,10 @@ basic [`basemap`] data assets, and optionally on the support package
 
 ## License
 
-The library is licensed under the [Historical Permission Notice and
-Disclaimer (HPND)], as indicated in [`LICENSE`]. Source code for the
-GEOS library is included in the `geos-3.3.3` directory under the terms
-of the [GNU Lesser General Public License version 2.1 (LGPL-2.1-only)]
-as given in [`LICENSE.geos`].
+The library is licensed under the terms of the [MIT] license (see
+[`LICENSE`]). Source code for the GEOS library is included in the
+`geos-3.3.3` directory under the terms of the [LGPLv2.1] license as
+given in [`LICENSE.geos`].
 
 
 [`matplotlib`]:
@@ -24,11 +23,13 @@ https://matplotlib.org/basemap/
 https://pypi.org/project/basemap-data
 [`basemap-data-hires`]:
 https://pypi.org/project/basemap-data-hires
+
+[LGPLv2.1]:
+https://spdx.org/licenses/LGPL-2.1-only.html
+[MIT]:
+https://spdx.org/licenses/MIT.html
+
 [`LICENSE`]:
 https://github.com/molinav/basemap/blob/develop/packages/basemap/LICENSE
 [`LICENSE.geos`]:
 https://github.com/molinav/basemap/blob/develop/packages/basemap/LICENSE.geos
-[GNU Lesser General Public License version 2.1 (LGPL-2.1-only)]:
-https://spdx.org/licenses/LGPL-2.1-only.html
-[Historical Permission Notice and Disclaimer (HPND)]:
-https://opensource.org/licenses/HPND

packages/basemap/setup.py

@@ -140,7 +140,7 @@ def checkversion(directory):
     "version":
         "1.3.0a3+dev",
     "license":
-        "OSI Approved",
+        "MIT",
     "description":
         "Plot data on map projections with matplotlib",
     "long_description":
@@ -161,7 +161,7 @@ def checkversion(directory):
         "Development Status :: 5 - Production/Stable",
         "Intended Audience :: Education",
         "Intended Audience :: Science/Research",
-        "License :: OSI Approved",
+        "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",
         "Programming Language :: Python :: 2",
         "Programming Language :: Python :: 3",