Skip to content

Commit ee4ce3c

Browse files
committed
Merge branch 'license' of diffpy/diffpy-release
* update license year to 2019 * add REST-formatted license.rst for the manual
2 parents 70bc69b + 5482906 commit ee4ce3c

File tree

2 files changed

+141
-1
lines changed

2 files changed

+141
-1
lines changed

Diff for: LICENSE.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Copyright (c) 2006-2007, Board of Trustees of Michigan State University
1010
Copyright (c) 2008-2012, The Trustees of Columbia University in the City
1111
of New York
1212

13-
Copyright (c) 2014-2017, Brookhaven Science Associates, Brookhaven National
13+
Copyright (c) 2014-2019, Brookhaven Science Associates, Brookhaven National
1414
Laboratory
1515

1616

Diff for: doc/manual/source/license.rst

+140
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
License
2+
#######
3+
4+
OPEN SOURCE LICENSE AGREEMENT
5+
=============================
6+
7+
| Copyright (c) 2009-2011, University of Tennessee
8+
| Copyright (c) 1989, 1991 Free Software Foundation, Inc.
9+
| Copyright (c) 2006, The Regents of the University of California through
10+
Lawrence Berkeley National Laboratory
11+
| Copyright (c) 2014, Australian Synchrotron Research Program Inc., ("ASRP")
12+
| Copyright (c) 2006-2007, Board of Trustees of Michigan State University
13+
| Copyright (c) 2008-2012, The Trustees of Columbia University in
14+
the City of New York
15+
| Copyright (c) 2014-2019, Brookhaven Science Associates,
16+
Brookhaven National Laboratory
17+
18+
19+
The "DiffPy-CMI" is distributed subject to the following license conditions:
20+
21+
22+
SOFTWARE LICENSE AGREEMENT
23+
==========================
24+
25+
Software: **DiffPy-CMI**
26+
27+
28+
(1) The "Software", below, refers to the aforementioned DiffPy-CMI (in either
29+
source code, or binary form and accompanying documentation).
30+
31+
Part of the software was derived from the DANSE, ObjCryst++ (with permission),
32+
PyCifRW, Python periodictable, CCTBX, and SasView open source projects, of
33+
which the original Copyrights are contained in each individual file.
34+
35+
Each licensee is addressed as "you" or "Licensee."
36+
37+
38+
(2) The copyright holders shown above and their third-party Licensors hereby
39+
grant licensee a royalty-free nonexclusive license, subject to the limitations
40+
stated herein and U.S. Government license rights.
41+
42+
43+
(3) You may modify and make a copy or copies of the software for use within
44+
your organization, if you meet the following conditions:
45+
46+
(a) Copies in source code must include the copyright notice and this
47+
software license agreement.
48+
49+
(b) Copies in binary form must include the copyright notice and this
50+
Software License Agreement in the documentation and/or other materials
51+
provided with the copy.
52+
53+
54+
(4) You may modify a copy or copies of the Software or any portion of it, thus
55+
forming a work based on the Software, and distribute copies of such work
56+
outside your organization, if you meet all of the following conditions:
57+
58+
(a) Copies in source code must include the copyright notice and this
59+
Software License Agreement;
60+
61+
(b) Copies in binary form must include the copyright notice and this
62+
Software License Agreement in the documentation and/or other materials
63+
provided with the copy;
64+
65+
(c) Modified copies and works based on the Software must carry prominent
66+
notices stating that you changed specified portions of the Software.
67+
68+
(d) Neither the name of Brookhaven Science Associates or Brookhaven
69+
National Laboratory nor the names of its contributors may be used to
70+
endorse or promote products derived from this software without specific
71+
written permission.
72+
73+
74+
(5) Portions of the Software resulted from work developed under a U.S.
75+
Government contract and are subject to the following license:
76+
The Government is granted for itself and others acting on its behalf a
77+
paid-up, nonexclusive, irrevocable worldwide license in this computer software
78+
to reproduce, prepare derivative works, and perform publicly and display
79+
publicly.
80+
81+
82+
(6) WARRANTY DISCLAIMER. THE SOFTWARE IS SUPPLIED "AS IS" WITHOUT
83+
WARRANTY OF ANY KIND. THE COPYRIGHT HOLDERS, THEIR THIRD PARTY
84+
LICENSORS, THE UNITED STATES, THE UNITED STATES DEPARTMENT OF ENERGY, AND
85+
THEIR EMPLOYEES: (1) DISCLAIM ANY WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
86+
BUT NOT LIMITED TO ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
87+
PARTICULAR PURPOSE, TITLE OR NON-INFRINGEMENT, (2) DO NOT ASSUME ANY LEGAL
88+
LIABILITY OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, OR USEFULNESS OF
89+
THE SOFTWARE, (3) DO NOT REPRESENT THAT USE OF THE SOFTWARE WOULD NOT INFRINGE
90+
PRIVATELY OWNED RIGHTS, (4) DO NOT WARRANT THAT THE SOFTWARE WILL FUNCTION
91+
UNINTERRUPTED, THAT IT IS ERROR-FREE OR THAT ANY ERRORS WILL BE CORRECTED.
92+
93+
94+
(7) LIMITATION OF LIABILITY. IN NO EVENT WILL THE COPYRIGHT HOLDERS, THEIR
95+
THIRD PARTY LICENSORS, THE UNITED STATES, THE UNITED STATES DEPARTMENT OF
96+
ENERGY, OR THEIR EMPLOYEES: BE LIABLE FOR ANY INDIRECT, INCIDENTAL,
97+
CONSEQUENTIAL, SPECIAL OR PUNITIVE DAMAGES OF ANY KIND OR NATURE, INCLUDING
98+
BUT NOT LIMITED TO LOSS OF PROFITS OR LOSS OF DATA, FOR ANY REASON WHATSOEVER,
99+
WHETHER SUCH LIABILITY IS ASSERTED ON THE BASIS OF CONTRACT, TORT (INCLUDING
100+
NEGLIGENCE OR STRICT LIABILITY), OR OTHERWISE, EVEN IF ANY OF SAID PARTIES HAS
101+
BEEN WARNED OF THE POSSIBILITY OF SUCH LOSS OR DAMAGES.
102+
103+
104+
Brookhaven National Laboratory Notice
105+
=====================================
106+
107+
Acknowledgment of sponsorship
108+
-----------------------------
109+
110+
This software was produced by the Brookhaven National Laboratory, under
111+
Contract DE-AC02-98CH10886 with the Department of Energy.
112+
113+
114+
Government disclaimer of liability
115+
----------------------------------
116+
117+
Neither the United States nor the United States Department of Energy, nor
118+
any of their employees, makes any warranty, express or implied, or assumes
119+
any legal liability or responsibility for the accuracy, completeness, or
120+
usefulness of any data, apparatus, product, or process disclosed, or
121+
represents that its use would not infringe privately owned rights.
122+
123+
124+
Brookhaven disclaimer of liability
125+
----------------------------------
126+
127+
Brookhaven National Laboratory makes no representations or warranties,
128+
express or implied, nor assumes any liability for the use of this software.
129+
130+
131+
Maintenance of notice
132+
---------------------
133+
134+
In the interest of clarity regarding the origin and status of this
135+
software, Brookhaven National Laboratory requests that any recipient of it
136+
maintain this notice affixed to any distribution by the recipient that
137+
contains a copy or derivative of this software.
138+
139+
140+
.. rubric:: END OF LICENSE

0 commit comments

Comments
 (0)