-
Notifications
You must be signed in to change notification settings - Fork 20
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add license files #109
Add license files #109
Changes from 3 commits
95dc0f5
4c30cc9
2003404
d7ea35d
053a22d
a20ee87
291a1bf
1195065
05a73a0
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,137 @@ | ||
OPEN SOURCE LICENSE AGREEMENT | ||
============================= | ||
|
||
Copyright (c) 2009-2011, University of Tennessee | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. we need to update the copyright so that 2019-2024 is columbia again. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. done |
||
Copyright (c) 1989, 1991 Free Software Foundation, Inc. | ||
Copyright (c) 2006, The Regents of the University of California through | ||
Lawrence Berkeley National Laboratory | ||
Copyright (c) 2014, Australian Synchrotron Research Program Inc., ("ASRP") | ||
Copyright (c) 2006-2007, Board of Trustees of Michigan State University | ||
Copyright (c) 2008-2012, The Trustees of Columbia University in the City | ||
of New York | ||
|
||
Copyright (c) 2014-2019, Brookhaven Science Associates, Brookhaven National | ||
Laboratory | ||
|
||
|
||
The "DiffPy-CMI" is distributed subject to the following license conditions: | ||
|
||
|
||
SOFTWARE LICENSE AGREEMENT | ||
|
||
Software: DiffPy-CMI | ||
|
||
|
||
(1) The "Software", below, refers to the aforementioned DiffPy-CMI (in either | ||
source code, or binary form and accompanying documentation). | ||
|
||
Part of the software was derived from the DANSE, ObjCryst++ (with permission), | ||
PyCifRW, Python periodictable, CCTBX, and SasView open source projects, of | ||
which the original Copyrights are contained in each individual file. | ||
|
||
Each licensee is addressed as "you" or "Licensee." | ||
|
||
|
||
(2) The copyright holders shown above and their third-party Licensors hereby | ||
grant licensee a royalty-free nonexclusive license, subject to the limitations | ||
stated herein and U.S. Government license rights. | ||
|
||
|
||
(3) You may modify and make a copy or copies of the software for use within | ||
your organization, if you meet the following conditions: | ||
|
||
(a) Copies in source code must include the copyright notice and this | ||
software license agreement. | ||
|
||
(b) Copies in binary form must include the copyright notice and this | ||
Software License Agreement in the documentation and/or other materials | ||
provided with the copy. | ||
|
||
|
||
(4) You may modify a copy or copies of the Software or any portion of it, thus | ||
forming a work based on the Software, and distribute copies of such work | ||
outside your organization, if you meet all of the following conditions: | ||
|
||
(a) Copies in source code must include the copyright notice and this | ||
Software License Agreement; | ||
|
||
(b) Copies in binary form must include the copyright notice and this | ||
Software License Agreement in the documentation and/or other materials | ||
provided with the copy; | ||
|
||
(c) Modified copies and works based on the Software must carry prominent | ||
notices stating that you changed specified portions of the Software. | ||
|
||
(d) Neither the name of Brookhaven Science Associates or Brookhaven | ||
National Laboratory nor the names of its contributors may be used to | ||
endorse or promote products derived from this software without specific | ||
written permission. | ||
|
||
|
||
(5) Portions of the Software resulted from work developed under a U.S. | ||
Government contract and are subject to the following license: | ||
The Government is granted for itself and others acting on its behalf a | ||
paid-up, nonexclusive, irrevocable worldwide license in this computer software | ||
to reproduce, prepare derivative works, and perform publicly and display | ||
publicly. | ||
|
||
|
||
(6) WARRANTY DISCLAIMER. THE SOFTWARE IS SUPPLIED "AS IS" WITHOUT | ||
WARRANTY OF ANY KIND. THE COPYRIGHT HOLDERS, THEIR THIRD PARTY | ||
LICENSORS, THE UNITED STATES, THE UNITED STATES DEPARTMENT OF ENERGY, AND | ||
THEIR EMPLOYEES: (1) DISCLAIM ANY WARRANTIES, EXPRESS OR IMPLIED, INCLUDING | ||
BUT NOT LIMITED TO ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A | ||
PARTICULAR PURPOSE, TITLE OR NON-INFRINGEMENT, (2) DO NOT ASSUME ANY LEGAL | ||
LIABILITY OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, OR USEFULNESS OF | ||
THE SOFTWARE, (3) DO NOT REPRESENT THAT USE OF THE SOFTWARE WOULD NOT INFRINGE | ||
PRIVATELY OWNED RIGHTS, (4) DO NOT WARRANT THAT THE SOFTWARE WILL FUNCTION | ||
UNINTERRUPTED, THAT IT IS ERROR-FREE OR THAT ANY ERRORS WILL BE CORRECTED. | ||
|
||
|
||
(7) LIMITATION OF LIABILITY. IN NO EVENT WILL THE COPYRIGHT HOLDERS, THEIR | ||
THIRD PARTY LICENSORS, THE UNITED STATES, THE UNITED STATES DEPARTMENT OF | ||
ENERGY, OR THEIR EMPLOYEES: BE LIABLE FOR ANY INDIRECT, INCIDENTAL, | ||
CONSEQUENTIAL, SPECIAL OR PUNITIVE DAMAGES OF ANY KIND OR NATURE, INCLUDING | ||
BUT NOT LIMITED TO LOSS OF PROFITS OR LOSS OF DATA, FOR ANY REASON WHATSOEVER, | ||
WHETHER SUCH LIABILITY IS ASSERTED ON THE BASIS OF CONTRACT, TORT (INCLUDING | ||
NEGLIGENCE OR STRICT LIABILITY), OR OTHERWISE, EVEN IF ANY OF SAID PARTIES HAS | ||
BEEN WARNED OF THE POSSIBILITY OF SUCH LOSS OR DAMAGES. | ||
|
||
|
||
Brookhaven National Laboratory Notice | ||
===================================== | ||
|
||
Acknowledgment of sponsorship | ||
----------------------------- | ||
|
||
This software was produced by the Brookhaven National Laboratory, under | ||
Contract DE-AC02-98CH10886 with the Department of Energy. | ||
|
||
|
||
Government disclaimer of liability | ||
---------------------------------- | ||
|
||
Neither the United States nor the United States Department of Energy, nor | ||
any of their employees, makes any warranty, express or implied, or assumes | ||
any legal liability or responsibility for the accuracy, completeness, or | ||
usefulness of any data, apparatus, product, or process disclosed, or | ||
represents that its use would not infringe privately owned rights. | ||
|
||
|
||
Brookhaven disclaimer of liability | ||
---------------------------------- | ||
|
||
Brookhaven National Laboratory makes no representations or warranties, | ||
express or implied, nor assumes any liability for the use of this software. | ||
|
||
|
||
Maintenance of notice | ||
--------------------- | ||
|
||
In the interest of clarity regarding the origin and status of this | ||
software, Brookhaven National Laboratory requests that any recipient of it | ||
maintain this notice affixed to any distribution by the recipient that | ||
contains a copy or derivative of this software. | ||
|
||
|
||
END OF LICENSE |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
This program is part of the DiffPy and DANSE open-source projects | ||
sbillinge marked this conversation as resolved.
Show resolved
Hide resolved
|
||
and is available subject to the conditions and terms laid out below. | ||
|
||
Copyright 2006-2007, Board of Trustees of Michigan State University, | ||
Copyright 2008-2012, The Trustees of Columbia University in the | ||
city of New York. (Copyright holder indicated in each source file). | ||
|
||
For more information please visit the project web-page: | ||
http://www.diffpy.org/ | ||
or email Prof. Simon Billinge at sb2896@columbia.edu | ||
|
||
Redistribution and use in source and binary forms, with or without | ||
modification, are permitted provided that the following conditions | ||
are met: | ||
|
||
* Redistributions of source code must retain the above copyright | ||
notice, this list of conditions and the following disclaimer. | ||
|
||
* 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. | ||
|
||
* Neither the name of the copyright holder nor the names of its | ||
contributors may be used to endorse or promote products derived from | ||
this software without specific prior written permission. | ||
|
||
THIS SOFTWARE IS PROVIDED BY COPYRIGHT HOLDER "AS IS". COPYRIGHT HOLDER | ||
EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES AND CONDITIONS, EITHER | ||
EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
WARRANTIES OF MERCHANTABILITY, TITLE, FITNESS, ADEQUACY OR SUITABILITY | ||
FOR A PARTICULAR PURPOSE, AND ANY WARRANTIES OF FREEDOM FROM | ||
INFRINGEMENT OF ANY DOMESTIC OR FOREIGN PATENT, COPYRIGHTS, TRADE | ||
SECRETS OR OTHER PROPRIETARY RIGHTS OF ANY PARTY. IN NO EVENT SHALL | ||
COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR ANY DIRECT, INDIRECT, | ||
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF | ||
USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | ||
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
THIS SOFTWARE OR RELATING TO THIS AGREEMENT, EVEN IF ADVISED OF THE | ||
POSSIBILITY OF SUCH DAMAGE. |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -20,7 +20,7 @@ classifiers = [ | |
'Environment :: Console', | ||
'Intended Audience :: Developers', | ||
'Intended Audience :: Science/Research', | ||
'License :: OSI Approved :: BSD License', | ||
'License :: Other/Proprietary License', | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Using the convention from above. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this is not proprietary. Is there one that says something like free for use with restrictions or sthg that actually matches what hte license says? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
How about this? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please see the new update.
|
||
'Operating System :: MacOS :: MacOS X', | ||
'Operating System :: Microsoft :: Windows', | ||
'Operating System :: POSIX', | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We would like this to be LICENSE.rst, but rst format but with the text from LICENSE.txt
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done