Skip to content

Commit

Permalink
Add 3-clause BSD license
Browse files Browse the repository at this point in the history
  • Loading branch information
marinkaz committed Jun 25, 2016
1 parent ef5abc1 commit 39d44a8
Show file tree
Hide file tree
Showing 6 changed files with 48 additions and 734 deletions.
705 changes: 31 additions & 674 deletions COPYING.txt

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions JMLR.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
JMLR Warranty
-------------

THIS SOURCE CODE IS SUPPLIED "AS IS" WITHOUT WARRANTY OF ANY KIND, AND ITS AUTHOR AND THE JOURNAL OF MACHINE LEARNING RESEARCH (JMLR)
AND JMLR'S PUBLISHERS AND DISTRIBUTORS, DISCLAIM ANY AND ALL WARRANTIES, INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, AND ANY WARRANTIES OR NON INFRINGEMENT. THE USER ASSUMES ALL LIABILITY
AND RESPONSIBILITY FOR USE OF THIS SOURCE CODE, AND NEITHER THE AUTHOR NOR JMLR, NOR JMLR'S PUBLISHERS AND DISTRIBUTORS, WILL BE
LIABLE FOR DAMAGES OF ANY KIND RESULTING FROM ITS USE.

Without limiting the generality of the foregoing, neither the author, nor JMLR, nor JMLR's publishers and distributors, warrant that
the Source Code will be error-free, will operate without interruption, or will meet the needs of the user.
23 changes: 0 additions & 23 deletions LICENSE.txt

This file was deleted.

32 changes: 1 addition & 31 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Nimfa
.. |Coverage| image:: https://coveralls.io/repos/marinkaz/nimfa/badge.svg?branch=master&service=github
.. _Coverage: https://coveralls.io/github/marinkaz/nimfa?branch=master

Nimfa is a Python module that implements many algorithms for nonnegative matrix factorization.
Nimfa is a Python module that implements many algorithms for nonnegative matrix factorization. Nimfa is distributed under the BSD license.

The project was started in 2011 by Marinka Zitnik as a Google Summer of Code project, and since
then many volunteers have contributed. See the AUTHORS.rst file for a complete list of contributors.
Expand Down Expand Up @@ -82,33 +82,3 @@ Cite
pages = {849-853},
year = {2012}
}


License
-------

Nimfa - A Python Library for Nonnegative Matrix Factorization
Copyright (C) 2011-2016

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.


JMLR Warranty
-------------

THIS SOURCE CODE IS SUPPLIED "AS IS" WITHOUT WARRANTY OF ANY KIND, AND ITS AUTHOR AND THE JOURNAL OF MACHINE LEARNING RESEARCH (JMLR)
AND JMLR'S PUBLISHERS AND DISTRIBUTORS, DISCLAIM ANY AND ALL WARRANTIES, INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, AND ANY WARRANTIES OR NON INFRINGEMENT. THE USER ASSUMES ALL LIABILITY
AND RESPONSIBILITY FOR USE OF THIS SOURCE CODE, AND NEITHER THE AUTHOR NOR JMLR, NOR JMLR'S PUBLISHERS AND DISTRIBUTORS, WILL BE
LIABLE FOR DAMAGES OF ANY KIND RESULTING FROM ITS USE.

Without limiting the generality of the foregoing, neither the author, nor JMLR, nor JMLR's publishers and distributors, warrant that
the Source Code will be error-free, will operate without interruption, or will meet the needs of the user.
9 changes: 4 additions & 5 deletions nimfa/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@
factorization algorithms and methods.
"""

__author__ = "Marinka Zitnik"
__license__ = "GPL"
__version__ = "3.0"
__maintainer__ = "Marinka Zitnik"
__email__ = "[email protected]"
__license__ = 'BSD'
__version__ = '1.3.0'
__maintainer__ = 'Marinka Zitnik'
__email__ = '[email protected]'


from nimfa import examples
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
DOWNLOAD_URL = 'http://github.com/marinkaz/nimfa'
KEYWORDS = ['matrix factorization', 'nonnegative matrix factorization',
'bioinformatics', 'data mining', 'machine learning']
LICENSE = 'GPLv3'
LICENSE = 'BSD'
VERSION = '1.3.0'
ISRELEASED = True

Expand Down

0 comments on commit 39d44a8

Please sign in to comment.