Skip to content

Commit e90cc57

Browse files
authored
Merge pull request #140 from QInfer/license-change
Changed license to three-clause BSD.
2 parents 41ddbad + 46c69c7 commit e90cc57

Some content is hidden

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

43 files changed

+1060
-1305
lines changed

COPYING.txt

Lines changed: 6 additions & 656 deletions
Large diffs are not rendered by default.

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@ def write_version(filename=VERSION_TARGET):
6363
'Bayesian particle filtering for parameter estimation in quantum '
6464
'information applications.',
6565
long_description=long_description,
66-
license='http://www.gnu.org/licenses/agpl-3.0.en.html',
66+
license='https://opensource.org/licenses/BSD-3-Clause',
6767
classifiers=[
6868
'Development Status :: 4 - Beta',
6969
'Intended Audience :: Science/Research',
70-
'License :: OSI Approved :: GNU Affero General Public License v3',
70+
'License :: OSI Approved :: BSD License',
7171
'Natural Language :: English',
7272
'Operating System :: OS Independent',
7373
'Programming Language :: Python :: 2.7',

src/qinfer/__init__.py

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,36 @@
11
#!/usr/bin/python
22
# -*- coding: utf-8 -*-
33
##
4-
# __init__.py: Root of Qinfer package.
4+
# __init__.py: Root of QInfer package.
55
##
6-
# © 2012 Chris Ferrie (csferrie@gmail.com) and
7-
# Christopher E. Granade (cgranade@gmail.com)
8-
#
9-
# This file is a part of the Qinfer project.
10-
# Licensed under the AGPL version 3.
11-
##
12-
# This program is free software: you can redistribute it and/or modify
13-
# it under the terms of the GNU Affero General Public License as published by
14-
# the Free Software Foundation, either version 3 of the License, or
15-
# (at your option) any later version.
6+
# © 2017, Chris Ferrie (csferrie@gmail.com) and
7+
# Christopher Granade (cgranade@cgranade.com).
8+
#
9+
# Redistribution and use in source and binary forms, with or without
10+
# modification, are permitted provided that the following conditions are met:
11+
#
12+
# 1. Redistributions of source code must retain the above copyright
13+
# notice, this list of conditions and the following disclaimer.
14+
#
15+
# 2. Redistributions in binary form must reproduce the above copyright
16+
# notice, this list of conditions and the following disclaimer in the
17+
# documentation and/or other materials provided with the distribution.
1618
#
17-
# This program is distributed in the hope that it will be useful,
18-
# but WITHOUT ANY WARRANTY; without even the implied warranty of
19-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20-
# GNU Affero General Public License for more details.
19+
# 3. Neither the name of the copyright holder nor the names of its
20+
# contributors may be used to endorse or promote products derived from
21+
# this software without specific prior written permission.
2122
#
22-
# You should have received a copy of the GNU Affero General Public License
23-
# along with this program. If not, see <http://www.gnu.org/licenses/>.
23+
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
24+
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
25+
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
26+
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
27+
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
28+
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
29+
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
30+
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
31+
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
32+
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
33+
# POSSIBILITY OF SUCH DAMAGE.
2434
##
2535

2636
from __future__ import absolute_import

src/qinfer/_exceptions.py

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,36 @@
11
#!/usr/bin/python
22
# -*- coding: utf-8 -*-
33
##
4-
# _exceptions.py: Derived classes for Errors and Warnings specific to Qinfer.
4+
# _exceptions.py: Derived classes for Errors and Warnings specific to QInfer.
55
##
6-
# © 2012 Chris Ferrie (csferrie@gmail.com) and
7-
# Christopher E. Granade (cgranade@gmail.com)
8-
#
9-
# This file is a part of the Qinfer project.
10-
# Licensed under the AGPL version 3.
11-
##
12-
# This program is free software: you can redistribute it and/or modify
13-
# it under the terms of the GNU Affero General Public License as published by
14-
# the Free Software Foundation, either version 3 of the License, or
15-
# (at your option) any later version.
6+
# © 2017, Chris Ferrie (csferrie@gmail.com) and
7+
# Christopher Granade (cgranade@cgranade.com).
8+
#
9+
# Redistribution and use in source and binary forms, with or without
10+
# modification, are permitted provided that the following conditions are met:
11+
#
12+
# 1. Redistributions of source code must retain the above copyright
13+
# notice, this list of conditions and the following disclaimer.
14+
#
15+
# 2. Redistributions in binary form must reproduce the above copyright
16+
# notice, this list of conditions and the following disclaimer in the
17+
# documentation and/or other materials provided with the distribution.
1618
#
17-
# This program is distributed in the hope that it will be useful,
18-
# but WITHOUT ANY WARRANTY; without even the implied warranty of
19-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20-
# GNU Affero General Public License for more details.
19+
# 3. Neither the name of the copyright holder nor the names of its
20+
# contributors may be used to endorse or promote products derived from
21+
# this software without specific prior written permission.
2122
#
22-
# You should have received a copy of the GNU Affero General Public License
23-
# along with this program. If not, see <http://www.gnu.org/licenses/>.
23+
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
24+
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
25+
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
26+
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
27+
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
28+
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
29+
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
30+
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
31+
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
32+
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
33+
# POSSIBILITY OF SUCH DAMAGE.
2434
##
2535

2636
## FEATURES ###################################################################

src/qinfer/_lib/__init__.py

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,32 @@
66
# licensed as described within each file, or by the corresponding
77
# LICENSE and/or COPYING files.
88
##
9-
# © 2012 Chris Ferrie (csferrie@gmail.com) and
10-
# Christopher E. Granade (cgranade@gmail.com)
11-
#
12-
# This file is a part of the Qinfer project.
13-
# Licensed under the AGPL version 3.
14-
##
15-
# This program is free software: you can redistribute it and/or modify
16-
# it under the terms of the GNU Affero General Public License as published by
17-
# the Free Software Foundation, either version 3 of the License, or
18-
# (at your option) any later version.
9+
# © 2017, Chris Ferrie (csferrie@gmail.com) and
10+
# Christopher Granade (cgranade@cgranade.com).
11+
#
12+
# Redistribution and use in source and binary forms, with or without
13+
# modification, are permitted provided that the following conditions are met:
14+
#
15+
# 1. Redistributions of source code must retain the above copyright
16+
# notice, this list of conditions and the following disclaimer.
17+
#
18+
# 2. Redistributions in binary form must reproduce the above copyright
19+
# notice, this list of conditions and the following disclaimer in the
20+
# documentation and/or other materials provided with the distribution.
1921
#
20-
# This program is distributed in the hope that it will be useful,
21-
# but WITHOUT ANY WARRANTY; without even the implied warranty of
22-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
23-
# GNU Affero General Public License for more details.
22+
# 3. Neither the name of the copyright holder nor the names of its
23+
# contributors may be used to endorse or promote products derived from
24+
# this software without specific prior written permission.
2425
#
25-
# You should have received a copy of the GNU Affero General Public License
26-
# along with this program. If not, see <http://www.gnu.org/licenses/>.
26+
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
27+
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
28+
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
29+
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
30+
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
31+
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
32+
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
33+
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
34+
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
35+
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
36+
# POSSIBILITY OF SUCH DAMAGE.
2737
##
28-

src/qinfer/abstract_model.py

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,34 @@
44
# abstract_model.py: Abstract interfaces for models with different levels of
55
# functionality.
66
##
7-
# © 2012 Chris Ferrie (csferrie@gmail.com) and
8-
# Christopher E. Granade (cgranade@gmail.com)
9-
#
10-
# This file is a part of the Qinfer project.
11-
# Licensed under the AGPL version 3.
12-
##
13-
# This program is free software: you can redistribute it and/or modify
14-
# it under the terms of the GNU Affero General Public License as published by
15-
# the Free Software Foundation, either version 3 of the License, or
16-
# (at your option) any later version.
7+
# © 2017, Chris Ferrie (csferrie@gmail.com) and
8+
# Christopher Granade (cgranade@cgranade.com).
9+
#
10+
# Redistribution and use in source and binary forms, with or without
11+
# modification, are permitted provided that the following conditions are met:
12+
#
13+
# 1. Redistributions of source code must retain the above copyright
14+
# notice, this list of conditions and the following disclaimer.
15+
#
16+
# 2. Redistributions in binary form must reproduce the above copyright
17+
# notice, this list of conditions and the following disclaimer in the
18+
# documentation and/or other materials provided with the distribution.
1719
#
18-
# This program is distributed in the hope that it will be useful,
19-
# but WITHOUT ANY WARRANTY; without even the implied warranty of
20-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21-
# GNU Affero General Public License for more details.
20+
# 3. Neither the name of the copyright holder nor the names of its
21+
# contributors may be used to endorse or promote products derived from
22+
# this software without specific prior written permission.
2223
#
23-
# You should have received a copy of the GNU Affero General Public License
24-
# along with this program. If not, see <http://www.gnu.org/licenses/>.
24+
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
25+
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
26+
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
27+
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
28+
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
29+
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
30+
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
31+
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
32+
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
33+
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
34+
# POSSIBILITY OF SUCH DAMAGE.
2535
##
2636

2737
## FEATURES ##################################################################

src/qinfer/ale.py

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,34 @@
33
##
44
# ale.py: Adaptive likelihood estimation utilities and models.
55
##
6-
# © 2012 Chris Ferrie (csferrie@gmail.com) and
7-
# Christopher E. Granade (cgranade@gmail.com)
6+
# © 2017, Chris Ferrie (csferrie@gmail.com) and
7+
# Christopher Granade (cgranade@cgranade.com).
88
#
9-
# This file is a part of the Qinfer project.
10-
# Licensed under the AGPL version 3.
11-
##
12-
# This program is free software: you can redistribute it and/or modify
13-
# it under the terms of the GNU Affero General Public License as published by
14-
# the Free Software Foundation, either version 3 of the License, or
15-
# (at your option) any later version.
9+
# Redistribution and use in source and binary forms, with or without
10+
# modification, are permitted provided that the following conditions are met:
11+
#
12+
# 1. Redistributions of source code must retain the above copyright
13+
# notice, this list of conditions and the following disclaimer.
14+
#
15+
# 2. Redistributions in binary form must reproduce the above copyright
16+
# notice, this list of conditions and the following disclaimer in the
17+
# documentation and/or other materials provided with the distribution.
1618
#
17-
# This program is distributed in the hope that it will be useful,
18-
# but WITHOUT ANY WARRANTY; without even the implied warranty of
19-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20-
# GNU Affero General Public License for more details.
19+
# 3. Neither the name of the copyright holder nor the names of its
20+
# contributors may be used to endorse or promote products derived from
21+
# this software without specific prior written permission.
2122
#
22-
# You should have received a copy of the GNU Affero General Public License
23-
# along with this program. If not, see <http://www.gnu.org/licenses/>.
23+
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
24+
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
25+
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
26+
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
27+
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
28+
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
29+
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
30+
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
31+
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
32+
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
33+
# POSSIBILITY OF SUCH DAMAGE.
2434
##
2535

2636
## FEATURES ###################################################################

src/qinfer/clustering.py

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,34 @@
33
##
44
# clustering.py: Wraps clustering algorithms provided by SciKit-Learn.
55
##
6-
# © 2013 Chris Ferrie (csferrie@gmail.com) and
7-
# Christopher E. Granade (cgranade@gmail.com)
6+
# © 2017, Chris Ferrie (csferrie@gmail.com) and
7+
# Christopher Granade (cgranade@cgranade.com).
88
#
9-
# This file is a part of the Qinfer project.
10-
# Licensed under the AGPL version 3.
11-
##
12-
# This program is free software: you can redistribute it and/or modify
13-
# it under the terms of the GNU Affero General Public License as published by
14-
# the Free Software Foundation, either version 3 of the License, or
15-
# (at your option) any later version.
9+
# Redistribution and use in source and binary forms, with or without
10+
# modification, are permitted provided that the following conditions are met:
11+
#
12+
# 1. Redistributions of source code must retain the above copyright
13+
# notice, this list of conditions and the following disclaimer.
14+
#
15+
# 2. Redistributions in binary form must reproduce the above copyright
16+
# notice, this list of conditions and the following disclaimer in the
17+
# documentation and/or other materials provided with the distribution.
1618
#
17-
# This program is distributed in the hope that it will be useful,
18-
# but WITHOUT ANY WARRANTY; without even the implied warranty of
19-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20-
# GNU Affero General Public License for more details.
19+
# 3. Neither the name of the copyright holder nor the names of its
20+
# contributors may be used to endorse or promote products derived from
21+
# this software without specific prior written permission.
2122
#
22-
# You should have received a copy of the GNU Affero General Public License
23-
# along with this program. If not, see <http://www.gnu.org/licenses/>.
23+
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
24+
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
25+
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
26+
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
27+
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
28+
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
29+
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
30+
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
31+
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
32+
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
33+
# POSSIBILITY OF SUCH DAMAGE.
2434
##
2535

2636
## FEATURES ###################################################################

src/qinfer/config.py

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,34 @@
33
##
44
# config.py: Stores configuration information.
55
##
6-
# © 2012 Chris Ferrie (csferrie@gmail.com) and
7-
# Christopher E. Granade (cgranade@gmail.com)
6+
# © 2017, Chris Ferrie (csferrie@gmail.com) and
7+
# Christopher Granade (cgranade@cgranade.com).
88
#
9-
# This file is a part of the Qinfer project.
10-
# Licensed under the AGPL version 3.
11-
##
12-
# This program is free software: you can redistribute it and/or modify
13-
# it under the terms of the GNU Affero General Public License as published by
14-
# the Free Software Foundation, either version 3 of the License, or
15-
# (at your option) any later version.
9+
# Redistribution and use in source and binary forms, with or without
10+
# modification, are permitted provided that the following conditions are met:
11+
#
12+
# 1. Redistributions of source code must retain the above copyright
13+
# notice, this list of conditions and the following disclaimer.
14+
#
15+
# 2. Redistributions in binary form must reproduce the above copyright
16+
# notice, this list of conditions and the following disclaimer in the
17+
# documentation and/or other materials provided with the distribution.
1618
#
17-
# This program is distributed in the hope that it will be useful,
18-
# but WITHOUT ANY WARRANTY; without even the implied warranty of
19-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20-
# GNU Affero General Public License for more details.
19+
# 3. Neither the name of the copyright holder nor the names of its
20+
# contributors may be used to endorse or promote products derived from
21+
# this software without specific prior written permission.
2122
#
22-
# You should have received a copy of the GNU Affero General Public License
23-
# along with this program. If not, see <http://www.gnu.org/licenses/>.
23+
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
24+
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
25+
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
26+
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
27+
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
28+
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
29+
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
30+
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
31+
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
32+
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
33+
# POSSIBILITY OF SUCH DAMAGE.
2434
##
2535

2636

0 commit comments

Comments
 (0)