Skip to content

Commit

Permalink
Merge pull request #1046 from ecederstrand/patch-1
Browse files Browse the repository at this point in the history
Change MIT license text to standard OSI wording
  • Loading branch information
jswhit committed Oct 22, 2020
2 parents 0ad67b0 + 7434259 commit 48978dd
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 29 deletions.
27 changes: 0 additions & 27 deletions COPYING

This file was deleted.

7 changes: 7 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Copyright 2008 Jeffrey Whitaker

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 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.
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@ def _populate_hdf5_info(dirstosearch, inc_dirs, libs, lib_dirs):
url="http://github.com/Unidata/netcdf4-python",
download_url="http://python.org/pypi/netCDF4",
platforms=["any"],
license="OSI Approved",
license="MIT",
description="Provides an object-oriented python interface to the netCDF version 4 library.",
keywords=['numpy', 'netcdf', 'data', 'science', 'network', 'oceanography',
'meteorology', 'climate'],
Expand All @@ -627,7 +627,7 @@ def _populate_hdf5_info(dirstosearch, inc_dirs, libs, lib_dirs):
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Intended Audience :: Science/Research",
"License :: OSI Approved",
"License :: MIT license",
"Topic :: Software Development :: Libraries :: Python Modules",
"Topic :: System :: Archiving :: Compression",
"Operating System :: OS Independent"],
Expand Down

0 comments on commit 48978dd

Please sign in to comment.