This is an automated email from the git hooks/post-receive script. yoh pushed a commit to annotated tag v0.1 in repository python-mne.
commit 4fa2c3bca228ee4bfbb60c1b01e94634a040c985 Author: Alexandre Gramfort <[email protected]> Date: Fri Jan 21 21:55:51 2011 -0500 BSD 3-clause licensing --- LICENSE.txt | 24 ++++++++++++++++++++++++ README.rst | 2 +- examples/plot_compute_mne_inverse.py | 2 +- examples/plot_read_epochs.py | 2 +- examples/plot_read_evoked.py | 2 +- examples/plot_read_noise_covariance_matrix.py | 2 +- examples/plot_read_raw_data.py | 2 +- examples/read_bem_surfaces.py | 2 +- examples/read_events.py | 2 +- examples/read_forward.py | 2 +- examples/read_inverse.py | 2 +- examples/read_stc.py | 2 +- examples/read_write_raw.py | 2 +- mne/bem_surfaces.py | 2 +- mne/cov.py | 2 +- mne/epochs.py | 2 +- mne/event.py | 2 +- mne/fiff/__init__.py | 2 +- mne/fiff/bunch.py | 2 +- mne/fiff/channels.py | 2 +- mne/fiff/constants.py | 2 +- mne/fiff/ctf.py | 2 +- mne/fiff/evoked.py | 2 +- mne/fiff/matrix.py | 2 +- mne/fiff/meas_info.py | 2 +- mne/fiff/open.py | 2 +- mne/fiff/pick.py | 2 +- mne/fiff/proj.py | 2 +- mne/fiff/raw.py | 2 +- mne/fiff/tag.py | 2 +- mne/fiff/tree.py | 2 +- mne/fiff/write.py | 2 +- mne/forward.py | 2 +- mne/inverse.py | 2 +- mne/source_space.py | 2 +- mne/stc.py | 2 +- mne/tests/test_epochs.py | 2 +- setup.py | 2 +- 38 files changed, 61 insertions(+), 37 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..32bef9c --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,24 @@ +Copyright (c) 2011, Alexandre Gramfort and Matti Hamalainen +All rights reserved. + +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 Massachusetts General Hospital 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 THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE 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, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/README.rst b/README.rst index 608c33f..6a9361e 100644 --- a/README.rst +++ b/README.rst @@ -11,7 +11,7 @@ Athinoula A. Martinos Center for Biomedical Imaging Massachusetts General Hospital Charlestown, MA, USA -Available under the Simplified BSD license (3-Clause). +Available under the BSD (3-clause) license. It is mainly a reimplementation of the Matlab code written by Matti Hämäläinen. diff --git a/examples/plot_compute_mne_inverse.py b/examples/plot_compute_mne_inverse.py index f4aa043..99beefc 100644 --- a/examples/plot_compute_mne_inverse.py +++ b/examples/plot_compute_mne_inverse.py @@ -6,7 +6,7 @@ Compute MNE inverse solution # Author: Alexandre Gramfort <[email protected]> # -# License: Simplified BSD +# License: BSD (3-clause) print __doc__ diff --git a/examples/plot_read_epochs.py b/examples/plot_read_epochs.py index d04489d..f1745f4 100644 --- a/examples/plot_read_epochs.py +++ b/examples/plot_read_epochs.py @@ -11,7 +11,7 @@ for both MEG and EEG data by averaging all the epochs. # Authors: Alexandre Gramfort <[email protected]> # Matti Hamalainen <[email protected]> # -# License: Simplified BSD +# License: BSD (3-clause) print __doc__ diff --git a/examples/plot_read_evoked.py b/examples/plot_read_evoked.py index f9aeba2..e9fb426 100644 --- a/examples/plot_read_evoked.py +++ b/examples/plot_read_evoked.py @@ -6,7 +6,7 @@ Reading and writing an evoked file """ # Author: Alexandre Gramfort <[email protected]> # -# License: Simplified BSD +# License: BSD (3-clause) print __doc__ diff --git a/examples/plot_read_noise_covariance_matrix.py b/examples/plot_read_noise_covariance_matrix.py index 2ea2211..b93382b 100644 --- a/examples/plot_read_noise_covariance_matrix.py +++ b/examples/plot_read_noise_covariance_matrix.py @@ -5,7 +5,7 @@ Reading/Writing a noise covariance matrix """ # Author: Alexandre Gramfort <[email protected]> # -# License: Simplified BSD +# License: BSD (3-clause) print __doc__ diff --git a/examples/plot_read_raw_data.py b/examples/plot_read_raw_data.py index b0305fa..9e585bd 100644 --- a/examples/plot_read_raw_data.py +++ b/examples/plot_read_raw_data.py @@ -5,7 +5,7 @@ Reading a raw file segment """ # Author: Alexandre Gramfort <[email protected]> # -# License: Simplified BSD +# License: BSD (3-clause) print __doc__ diff --git a/examples/read_bem_surfaces.py b/examples/read_bem_surfaces.py index 20766fc..ad9dcf4 100644 --- a/examples/read_bem_surfaces.py +++ b/examples/read_bem_surfaces.py @@ -5,7 +5,7 @@ Reading BEM surfaces from a forward solution """ # Author: Alexandre Gramfort <[email protected]> # -# License: Simplified BSD +# License: BSD (3-clause) print __doc__ diff --git a/examples/read_events.py b/examples/read_events.py index fcd941f..0c5b1bf 100644 --- a/examples/read_events.py +++ b/examples/read_events.py @@ -5,7 +5,7 @@ Reading an event file """ # Author: Alexandre Gramfort <[email protected]> # -# License: Simplified BSD +# License: BSD (3-clause) print __doc__ diff --git a/examples/read_forward.py b/examples/read_forward.py index 08557bf..11aa940 100644 --- a/examples/read_forward.py +++ b/examples/read_forward.py @@ -5,7 +5,7 @@ Reading a forward operator a.k.a. lead field matrix """ # Author: Alexandre Gramfort <[email protected]> # -# License: Simplified BSD +# License: BSD (3-clause) print __doc__ diff --git a/examples/read_inverse.py b/examples/read_inverse.py index fde542a..9515503 100644 --- a/examples/read_inverse.py +++ b/examples/read_inverse.py @@ -5,7 +5,7 @@ Reading an inverse operator """ # Author: Alexandre Gramfort <[email protected]> # -# License: Simplified BSD +# License: BSD (3-clause) print __doc__ diff --git a/examples/read_stc.py b/examples/read_stc.py index 50844ed..fe6d107 100644 --- a/examples/read_stc.py +++ b/examples/read_stc.py @@ -8,7 +8,7 @@ reconstructions """ # Author: Alexandre Gramfort <[email protected]> # -# License: Simplified BSD +# License: BSD (3-clause) print __doc__ diff --git a/examples/read_write_raw.py b/examples/read_write_raw.py index 8456e4e..59456cb 100644 --- a/examples/read_write_raw.py +++ b/examples/read_write_raw.py @@ -7,7 +7,7 @@ Read and write raw data in 60-sec blocks """ # Author: Alexandre Gramfort <[email protected]> # -# License: Simplified BSD +# License: BSD (3-clause) print __doc__ diff --git a/mne/bem_surfaces.py b/mne/bem_surfaces.py index 03feee0..a5adb16 100644 --- a/mne/bem_surfaces.py +++ b/mne/bem_surfaces.py @@ -1,7 +1,7 @@ # Authors: Alexandre Gramfort <[email protected]> # Matti Hamalainen <[email protected]> # -# License: Simplified BSD +# License: BSD (3-clause) import numpy as np from scipy import linalg diff --git a/mne/cov.py b/mne/cov.py index 720ac3f..a35b427 100644 --- a/mne/cov.py +++ b/mne/cov.py @@ -1,7 +1,7 @@ # Authors: Alexandre Gramfort <[email protected]> # Matti Hamalainen <[email protected]> # -# License: Simplified BSD +# License: BSD (3-clause) import os import numpy as np diff --git a/mne/epochs.py b/mne/epochs.py index 010b2c1..f6b4218 100644 --- a/mne/epochs.py +++ b/mne/epochs.py @@ -1,7 +1,7 @@ # Authors: Alexandre Gramfort <[email protected]> # Matti Hamalainen <[email protected]> # -# License: Simplified BSD +# License: BSD (3-clause) import numpy as np import fiff diff --git a/mne/event.py b/mne/event.py index a538f16..a13ab29 100644 --- a/mne/event.py +++ b/mne/event.py @@ -4,7 +4,7 @@ # Authors: Alexandre Gramfort <[email protected]> # Matti Hamalainen <[email protected]> # -# License: Simplified BSD +# License: BSD (3-clause) from .fiff.constants import FIFF from .fiff.tree import dir_tree_find diff --git a/mne/fiff/__init__.py b/mne/fiff/__init__.py index f10aec1..dffac30 100644 --- a/mne/fiff/__init__.py +++ b/mne/fiff/__init__.py @@ -1,7 +1,7 @@ # Authors: Alexandre Gramfort <[email protected]> # Matti Hamalainen <[email protected]> # -# License: Simplified BSD +# License: BSD (3-clause) __version__ = '0.1.git' diff --git a/mne/fiff/bunch.py b/mne/fiff/bunch.py index d31927f..5d226fe 100644 --- a/mne/fiff/bunch.py +++ b/mne/fiff/bunch.py @@ -1,7 +1,7 @@ # Authors: Alexandre Gramfort <[email protected]> # Matti Hamalainen <[email protected]> # -# License: Simplified BSD +# License: BSD (3-clause) class Bunch(dict): """ Container object for datasets: dictionnary-like object that diff --git a/mne/fiff/channels.py b/mne/fiff/channels.py index 402bec5..7b6b530 100644 --- a/mne/fiff/channels.py +++ b/mne/fiff/channels.py @@ -1,7 +1,7 @@ # Authors: Alexandre Gramfort <[email protected]> # Matti Hamalainen <[email protected]> # -# License: Simplified BSD +# License: BSD (3-clause) from .tree import dir_tree_find from .tag import find_tag diff --git a/mne/fiff/constants.py b/mne/fiff/constants.py index ec59aeb..b312aa5 100644 --- a/mne/fiff/constants.py +++ b/mne/fiff/constants.py @@ -1,7 +1,7 @@ # Authors: Alexandre Gramfort <[email protected]> # Matti Hamalainen <[email protected]> # -# License: Simplified BSD +# License: BSD (3-clause) from bunch import Bunch diff --git a/mne/fiff/ctf.py b/mne/fiff/ctf.py index 9767bf1..7111a90 100644 --- a/mne/fiff/ctf.py +++ b/mne/fiff/ctf.py @@ -1,7 +1,7 @@ # Authors: Alexandre Gramfort <[email protected]> # Matti Hamalainen <[email protected]> # -# License: Simplified BSD +# License: BSD (3-clause) import numpy as np diff --git a/mne/fiff/evoked.py b/mne/fiff/evoked.py index fb7611a..04966e6 100644 --- a/mne/fiff/evoked.py +++ b/mne/fiff/evoked.py @@ -1,7 +1,7 @@ # Authors: Alexandre Gramfort <[email protected]> # Matti Hamalainen <[email protected]> # -# License: Simplified BSD +# License: BSD (3-clause) import numpy as np diff --git a/mne/fiff/matrix.py b/mne/fiff/matrix.py index a59061e..199f7a3 100644 --- a/mne/fiff/matrix.py +++ b/mne/fiff/matrix.py @@ -1,7 +1,7 @@ # Authors: Alexandre Gramfort <[email protected]> # Matti Hamalainen <[email protected]> # -# License: Simplified BSD +# License: BSD (3-clause) from .constants import FIFF from .tag import find_tag, has_tag diff --git a/mne/fiff/meas_info.py b/mne/fiff/meas_info.py index 27da9af..2501125 100644 --- a/mne/fiff/meas_info.py +++ b/mne/fiff/meas_info.py @@ -1,7 +1,7 @@ # Authors: Alexandre Gramfort <[email protected]> # Matti Hamalainen <[email protected]> # -# License: Simplified BSD +# License: BSD (3-clause) import numpy as np diff --git a/mne/fiff/open.py b/mne/fiff/open.py index c200fe7..7ee6ec6 100644 --- a/mne/fiff/open.py +++ b/mne/fiff/open.py @@ -1,7 +1,7 @@ # Authors: Alexandre Gramfort <[email protected]> # Matti Hamalainen <[email protected]> # -# License: Simplified BSD +# License: BSD (3-clause) from .tag import read_tag_info, read_tag from .tree import make_dir_tree diff --git a/mne/fiff/pick.py b/mne/fiff/pick.py index 45f1364..2bbc266 100644 --- a/mne/fiff/pick.py +++ b/mne/fiff/pick.py @@ -1,7 +1,7 @@ # Authors: Alexandre Gramfort <[email protected]> # Matti Hamalainen <[email protected]> # -# License: Simplified BSD +# License: BSD (3-clause) from copy import copy diff --git a/mne/fiff/proj.py b/mne/fiff/proj.py index 2c5cb96..8a5a6c2 100644 --- a/mne/fiff/proj.py +++ b/mne/fiff/proj.py @@ -1,7 +1,7 @@ # Authors: Alexandre Gramfort <[email protected]> # Matti Hamalainen <[email protected]> # -# License: Simplified BSD +# License: BSD (3-clause) from math import sqrt import numpy as np diff --git a/mne/fiff/raw.py b/mne/fiff/raw.py index 100dbe7..6d8a0f9 100644 --- a/mne/fiff/raw.py +++ b/mne/fiff/raw.py @@ -1,7 +1,7 @@ # Authors: Alexandre Gramfort <[email protected]> # Matti Hamalainen <[email protected]> # -# License: Simplified BSD +# License: BSD (3-clause) from math import floor, ceil import numpy as np diff --git a/mne/fiff/tag.py b/mne/fiff/tag.py index e01de07..b7bd7ce 100644 --- a/mne/fiff/tag.py +++ b/mne/fiff/tag.py @@ -1,7 +1,7 @@ # Authors: Alexandre Gramfort <[email protected]> # Matti Hamalainen <[email protected]> # -# License: Simplified BSD +# License: BSD (3-clause) import struct import numpy as np diff --git a/mne/fiff/tree.py b/mne/fiff/tree.py index a1d7b18..ddd2cfa 100644 --- a/mne/fiff/tree.py +++ b/mne/fiff/tree.py @@ -1,7 +1,7 @@ # Authors: Alexandre Gramfort <[email protected]> # Matti Hamalainen <[email protected]> # -# License: Simplified BSD +# License: BSD (3-clause) from .bunch import Bunch from .tag import read_tag diff --git a/mne/fiff/write.py b/mne/fiff/write.py index c82c38a..645a603 100644 --- a/mne/fiff/write.py +++ b/mne/fiff/write.py @@ -1,7 +1,7 @@ # Authors: Alexandre Gramfort <[email protected]> # Matti Hamalainen <[email protected]> # -# License: Simplified BSD +# License: BSD (3-clause) import time import array diff --git a/mne/forward.py b/mne/forward.py index 455c8e7..ed5acee 100644 --- a/mne/forward.py +++ b/mne/forward.py @@ -1,7 +1,7 @@ # Authors: Alexandre Gramfort <[email protected]> # Matti Hamalainen <[email protected]> # -# License: Simplified BSD +# License: BSD (3-clause) import copy import numpy as np diff --git a/mne/inverse.py b/mne/inverse.py index ffb6665..41331d8 100644 --- a/mne/inverse.py +++ b/mne/inverse.py @@ -1,7 +1,7 @@ # Authors: Alexandre Gramfort <[email protected]> # Matti Hamalainen <[email protected]> # -# License: Simplified BSD +# License: BSD (3-clause) from math import sqrt import numpy as np diff --git a/mne/source_space.py b/mne/source_space.py index efb0717..2e975c1 100644 --- a/mne/source_space.py +++ b/mne/source_space.py @@ -1,7 +1,7 @@ # Authors: Alexandre Gramfort <[email protected]> # Matti Hamalainen <[email protected]> # -# License: Simplified BSD +# License: BSD (3-clause) from math import sqrt import numpy as np diff --git a/mne/stc.py b/mne/stc.py index f874d72..fdf9be8 100644 --- a/mne/stc.py +++ b/mne/stc.py @@ -1,7 +1,7 @@ # Authors: Alexandre Gramfort <[email protected]> # Matti Hamalainen <[email protected]> # -# License: Simplified BSD +# License: BSD (3-clause) import numpy as np diff --git a/mne/tests/test_epochs.py b/mne/tests/test_epochs.py index a190e4d..d01fe1d 100644 --- a/mne/tests/test_epochs.py +++ b/mne/tests/test_epochs.py @@ -1,6 +1,6 @@ # Author: Alexandre Gramfort <[email protected]> # -# License: Simplified BSD +# License: BSD (3-clause) import os import os.path as op diff --git a/setup.py b/setup.py index 624b309..b6b6b8e 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ LONG_DESCRIPTION = descr MAINTAINER = 'Alexandre Gramfort' MAINTAINER_EMAIL = '[email protected]' URL = 'http://github.com/mne/mne' -LICENSE = 'BSD' +LICENSE = 'BSD (3-clause)' DOWNLOAD_URL = 'http://github.com/mne/mne' VERSION = '0.1.git' -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-mne.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
