Permalink
Browse files

DOC: Added new license (simplified BSD). Bumped version to 0.4RC1.

  • Loading branch information...
1 parent 785fd48 commit b5988cc4da873c93c65d664f49228b64a7a84620 @twiecki twiecki committed Oct 29, 2012
Showing with 38 additions and 6 deletions.
  1. +7 −1 CHANGES.rst
  2. +26 −0 LICENSE
  3. +3 −3 README.rst
  4. +2 −2 docs/conf.py
View
@@ -8,10 +8,16 @@ Release Notes
HDDM 0.4
========
+License
+-------
+
+HDDM 0.4 is now distributed under the simplified BSD license (see the
+LICENSE file) instead of GPLv3.
+
New features
------------
-* Handling of outliers via mixture likelihood.
+* Handling of outliers via mixture model.
* New model HDDMRegression to allow estimation of trial-by-trial
regressions with a covariate.
* New model HDDMStimulusCoding.
View
26 LICENSE
@@ -0,0 +1,26 @@
+Copyright (c) 2012, Thomas V. Wiecki, Imri Sofer
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+2. 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.
+
+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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+The views and conclusions contained in the software and documentation are those
+of the authors and should not be interpreted as representing official policies,
+either expressed or implied, of the FreeBSD Project.
View
@@ -2,15 +2,15 @@
Introduction
************
-:Date: August 15, 2012
+:Date: October 29, 2012
:Author: Thomas V. Wiecki, Imri Sofer, Michael J. Frank
:Contact: thomas_wiecki@brown.edu, imri_sofer@brown.edu, michael_frank@brown.edu
:Web site: http://ski.clps.brown.edu/hddm_docs
:Github: http://github.com/hddm-devs/hddm
:Mailing list: https://groups.google.com/group/hddm-users/
:Copyright: This document has been placed in the public domain.
-:License: HDDM is released under the GPLv3.
-:Version: 0.3
+:License: HDDM is released under the BSD 2 license.
+:Version: 0.4RC1
Purpose
=======
View
@@ -45,9 +45,9 @@
# built documents.
#
# The short X.Y version.
-version = '0.2'
+version = '0.4'
# The full version, including alpha/beta/rc tags.
-release = '0.2'
+release = '0.4'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.

0 comments on commit b5988cc

Please sign in to comment.