Drop BSD 4-Clause license

This commit is contained in:
John Kirkham 2017-03-11 13:01:04 -05:00 committed by Stanislav
parent ccc5679022
commit f75dc02dcf
3 changed files with 2 additions and 27 deletions

24
LICENSE
View File

@ -13,27 +13,3 @@ the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
BSD License
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. All advertising materials mentioning features or use of this software
must display the following acknowledgement:
This product includes software developed by Balanced Inc.
4. Neither the name of Balanced Inc. nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.
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.

View File

@ -110,7 +110,7 @@ in the following format::
License
-------
``nose-timer`` is an MIT/BSD dual-Licensed library.
``nose-timer`` is MIT Licensed library.
Contribute

View File

@ -29,7 +29,7 @@ setup(
'termcolor',
'ordereddict',
],
license='MIT or BSD',
license='MIT',
entry_points={
'nose.plugins.0.10': [
'nosetimer = nosetimer.plugin:TimerPlugin',
@ -38,7 +38,6 @@ setup(
classifiers=[
'Intended Audience :: Developers',
'License :: OSI Approved :: MIT License',
'License :: OSI Approved :: BSD License',
'Natural Language :: English',
'Operating System :: OS Independent',
'Programming Language :: Python',