Skip to content

Commit 688669a

Browse files
sbillingesbillinge
authored
Merge pull request #109 from bobleesj/patch-2
Add license files
2 parents d4133d8 + 05a73a0 commit 688669a

File tree

5 files changed

+203
-36
lines changed

5 files changed

+203
-36
lines changed

Diff for: ‎CHANGELOG.rst

-8
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,6 @@ Release Notes
44

55
.. current developments
66
7-
3.4.1
8-
=====
9-
10-
**Fixed:**
11-
12-
* Updated package structure to new group standard
13-
14-
157
168
3.4.0
179
=====

Diff for: ‎LICENSE.rst

+138-27
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,141 @@
1-
BSD 3-Clause License
1+
OPEN SOURCE LICENSE AGREEMENT
2+
=============================
23

3-
Copyright (c) 2024, The Trustees of Columbia University
4-
in the City of New York.
4+
Copyright (c) 1989, 1991 Free Software Foundation, Inc.
5+
6+
Copyright (c) 2006, The Regents of the University of California through Lawrence Berkeley National Laboratory
7+
8+
Copyright (c) 2006-2007, Board of Trustees of Michigan State University
9+
10+
Copyright (c) 2008-2012, The Trustees of Columbia University in the City of New York
11+
12+
Copyright (c) 2009-2011, University of Tennessee
13+
14+
Copyright (c) 2014, Australian Synchrotron Research Program Inc., ("ASRP")
15+
16+
Copyright (c) 2014-2019, Brookhaven Science Associates, Brookhaven National Laboratory
17+
18+
Copyright (c) 2019-2024, The Trustees of Columbia University in the City of New York.
519
All rights reserved.
620

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

Diff for: ‎LICENSE_DANSE.txt

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
This program is part of the DiffPy and DANSE open-source projects
2+
and is available subject to the conditions and terms laid out below.
3+
4+
Copyright 2006-2007, Board of Trustees of Michigan State University,
5+
Copyright 2008-2012, The Trustees of Columbia University in the
6+
city of New York. (Copyright holder indicated in each source file).
7+
8+
For more information please visit the project web-page:
9+
http://www.diffpy.org/
10+
or email Prof. Simon Billinge at [email protected]
11+
12+
Redistribution and use in source and binary forms, with or without
13+
modification, are permitted provided that the following conditions
14+
are met:
15+
16+
* Redistributions of source code must retain the above copyright
17+
notice, this list of conditions and the following disclaimer.
18+
19+
* Redistributions in binary form must reproduce the above copyright
20+
notice, this list of conditions and the following disclaimer in the
21+
documentation and/or other materials provided with the distribution.
22+
23+
* Neither the name of the copyright holder nor the names of its
24+
contributors may be used to endorse or promote products derived from
25+
this software without specific prior written permission.
26+
27+
THIS SOFTWARE IS PROVIDED BY COPYRIGHT HOLDER "AS IS". COPYRIGHT HOLDER
28+
EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES AND CONDITIONS, EITHER
29+
EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
30+
WARRANTIES OF MERCHANTABILITY, TITLE, FITNESS, ADEQUACY OR SUITABILITY
31+
FOR A PARTICULAR PURPOSE, AND ANY WARRANTIES OF FREEDOM FROM
32+
INFRINGEMENT OF ANY DOMESTIC OR FOREIGN PATENT, COPYRIGHTS, TRADE
33+
SECRETS OR OTHER PROPRIETARY RIGHTS OF ANY PARTY. IN NO EVENT SHALL
34+
COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR ANY DIRECT, INDIRECT,
35+
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
36+
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
37+
USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
38+
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
39+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
40+
THIS SOFTWARE OR RELATING TO THIS AGREEMENT, EVEN IF ADVISED OF THE
41+
POSSIBILITY OF SUCH DAMAGE.

Diff for: ‎news/cookie.rst

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
**Added:**
2+
3+
* <news item>
4+
5+
**Changed:**
6+
7+
* <news item>
8+
9+
**Deprecated:**
10+
11+
* <news item>
12+
13+
**Removed:**
14+
15+
* <news item>
16+
17+
**Fixed:**
18+
19+
* Updated package structure to new group standard
20+
21+
**Security:**
22+
23+
* <news item>

Diff for: ‎pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ classifiers = [
2020
'Environment :: Console',
2121
'Intended Audience :: Developers',
2222
'Intended Audience :: Science/Research',
23-
'License :: OSI Approved :: BSD License',
23+
'License :: Free To Use But Restricted',
2424
'Operating System :: MacOS :: MacOS X',
2525
'Operating System :: Microsoft :: Windows',
2626
'Operating System :: POSIX',

0 commit comments

Comments
 (0)