Skip to content

Commit 08a601a

Browse files
authored
Merge pull request #73 from cadenmyers13/license-danse-rst
chore: move license file to rst format
2 parents 9b16f3b + 4f9bf63 commit 08a601a

122 files changed

Lines changed: 144 additions & 256 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
File renamed without changes.

‎docs/source/license.rst‎

Lines changed: 1 addition & 137 deletions
Original file line numberDiff line numberDiff line change
@@ -5,140 +5,4 @@
55
License
66
#######
77

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

‎news/license-danse-rst.rst‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
**Added:**
2+
3+
* <news item>
4+
5+
**Changed:**
6+
7+
* Rename ``LICENSE_DANSE.txt`` to ``LICENSE_DANSE.rst`` to match ``diffpy.srreal`` and update all in-file references.
8+
* Include ``LICENSE.rst`` in the license page of the documentation instead of keeping a separate hand-formatted copy.
9+
10+
**Deprecated:**
11+
12+
* <news item>
13+
14+
**Removed:**
15+
16+
* <news item>
17+
18+
**Fixed:**
19+
20+
* <news item>
21+
22+
**Security:**
23+
24+
* <news item>

‎src/diffpy/Attributes.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* File coded by: Pavol Juhas
99
*
1010
* See AUTHORS.rst for a list of people who contributed.
11-
* See LICENSE_DANSE.txt for license information.
11+
* See LICENSE_DANSE.rst for license information.
1212
*
1313
******************************************************************************
1414
*

‎src/diffpy/Attributes.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* File coded by: Pavol Juhas
99
*
1010
* See AUTHORS.rst for a list of people who contributed.
11-
* See LICENSE_DANSE.txt for license information.
11+
* See LICENSE_DANSE.rst for license information.
1212
*
1313
******************************************************************************
1414
*

‎src/diffpy/Attributes.ipp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* File coded by: Pavol Juhas
99
*
1010
* See AUTHORS.rst for a list of people who contributed.
11-
* See LICENSE_DANSE.txt for license information.
11+
* See LICENSE_DANSE.rst for license information.
1212
*
1313
******************************************************************************
1414
*

‎src/diffpy/HasClassRegistry.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* File coded by: Pavol Juhas
99
*
1010
* See AUTHORS.rst for a list of people who contributed.
11-
* See LICENSE_DANSE.txt for license information.
11+
* See LICENSE_DANSE.rst for license information.
1212
*
1313
******************************************************************************
1414
*

‎src/diffpy/HasClassRegistry.ipp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* File coded by: Pavol Juhas
99
*
1010
* See AUTHORS.rst for a list of people who contributed.
11-
* See LICENSE_DANSE.txt for license information.
11+
* See LICENSE_DANSE.rst for license information.
1212
*
1313
******************************************************************************
1414
*

‎src/diffpy/mathutils.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* File coded by: Pavol Juhas
99
*
1010
* See AUTHORS.rst for a list of people who contributed.
11-
* See LICENSE_DANSE.txt for license information.
11+
* See LICENSE_DANSE.rst for license information.
1212
*
1313
******************************************************************************
1414
*

‎src/diffpy/mathutils.ipp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* File coded by: Pavol Juhas
99
*
1010
* See AUTHORS.rst for a list of people who contributed.
11-
* See LICENSE_DANSE.txt for license information.
11+
* See LICENSE_DANSE.rst for license information.
1212
*
1313
******************************************************************************
1414
*

0 commit comments

Comments
 (0)