Change from CeCILL to BSD licence.

open-research · Jun 17, 2015 · 6527607 · 6527607
1 parent 2c8d8cc
commit 6527607
Show file tree

Hide file tree

Showing 49 changed files with 95 additions and 597 deletions.
diff --git a/COPYING b/COPYING
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,10 @@
+Copyright (c) 2015 The Sumatra authors and contributors
+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 HOLDER 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.
diff --git a/doc/authors.txt b/doc/authors.txt
@@ -45,10 +45,4 @@ Many thanks also go to everyone who has reported bugs on the issue tracker.
 Licence
 =======
 
-Sumatra is freely available under the CeCILL v2 license, which is equivalent to,
-and compatible with, the GNU GPL license, but conforms to French law (and is
-also perfectly suited to international projects) - see
-`<http://www.cecill.info/index.en.html>`_ for more information.
-
-If you are interested in using Sumatra, but the choice of licence is a problem
-for you, please contact us - we are open to persuasion.
+Sumatra is freely available under the BSD 2-clause license.
diff --git a/doc/conf.py b/doc/conf.py
@@ -39,7 +39,7 @@
 
 # General information about the project.
 project = 'Sumatra'
-copyright = '2009-2014 Andrew P. Davison'
+copyright = '2009-2015 Sumatra authors and contributors'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -174,7 +174,7 @@
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
   ('index', 'Sumatra.tex', 'Sumatra Documentation',
-   'Andrew P. Davison', 'manual'),
+   'The Sumatra Project', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of

diff --git a/setup.py b/setup.py
@@ -52,14 +52,14 @@ def get_tip_revision(self, path=os.getcwd()):
     author_email = "andrew.davison@unic.cnrs-gif.fr",
     description = "A tool for automated tracking of computation-based scientific projects",
     long_description = open('README.rst').read(),
-    license = "CeCILL http://www.cecill.info",
+    license = "BSD 2 clause",
     keywords = "computational science simulation analysis project-management",
     url = "http://neuralensemble.org/sumatra/",
     classifiers = ['Development Status :: 4 - Beta',
                    'Environment :: Console',
                    'Environment :: Web Environment',
                    'Intended Audience :: Science/Research',
-                   'License :: Other/Proprietary License',
+                   'License :: OSI Approved :: BSD License',
                    'Natural Language :: English',
                    'Operating System :: OS Independent',
                    'Programming Language :: Python',

diff --git a/sumatra/commands.py b/sumatra/commands.py
@@ -4,8 +4,8 @@
 Each command corresponds to a function in this module.
 
 
-:copyright: Copyright 2006-2014 by the Sumatra team, see doc/authors.txt
-:license: CeCILL, see LICENSE for details.
+:copyright: Copyright 2006-2015 by the Sumatra team, see doc/authors.txt
+:license: BSD 2-clause, see LICENSE for details.
 """
 from __future__ import print_function
 from __future__ import unicode_literals

diff --git a/sumatra/core.py b/sumatra/core.py
@@ -1,8 +1,8 @@
 """
 
 
-:copyright: Copyright 2006-2014 by the Sumatra team, see doc/authors.txt
-:license: CeCILL, see LICENSE for details.
+:copyright: Copyright 2006-2015 by the Sumatra team, see doc/authors.txt
+:license: BSD 2-clause, see LICENSE for details.
 """
 from __future__ import unicode_literals
 from builtins import str

diff --git a/sumatra/datastore/__init__.py b/sumatra/datastore/__init__.py
@@ -22,8 +22,8 @@
                    constructor arguments.
 
 
-:copyright: Copyright 2006-2014 by the Sumatra team, see doc/authors.txt
-:license: CeCILL, see LICENSE for details.
+:copyright: Copyright 2006-2015 by the Sumatra team, see doc/authors.txt
+:license: BSD 2-clause, see LICENSE for details.
 """
 from __future__ import unicode_literals
 

diff --git a/sumatra/datastore/archivingfs.py b/sumatra/datastore/archivingfs.py
@@ -4,7 +4,7 @@
 
 
 :copyright: Copyright 2006-2015 by the Sumatra team, see doc/authors.txt
-:license: CeCILL, see LICENSE for details.
+:license: BSD 2-clause, see LICENSE for details.
 """
 
 from __future__ import with_statement

diff --git a/sumatra/datastore/base.py b/sumatra/datastore/base.py
@@ -2,7 +2,7 @@
 
 
 :copyright: Copyright 2006-2015 by the Sumatra team, see doc/authors.txt
-:license: CeCILL, see LICENSE for details.
+:license: BSD 2-clause, see LICENSE for details.
 """
 from __future__ import unicode_literals
 from builtins import object

diff --git a/sumatra/datastore/filesystem.py b/sumatra/datastore/filesystem.py
@@ -3,7 +3,7 @@
 
 
 :copyright: Copyright 2006-2015 by the Sumatra team, see doc/authors.txt
-:license: CeCILL, see LICENSE for details.
+:license: BSD 2-clause, see LICENSE for details.
 """
 from __future__ import unicode_literals
 

diff --git a/sumatra/datastore/mirroredfs.py b/sumatra/datastore/mirroredfs.py
@@ -7,7 +7,7 @@
 
 
 :copyright: Copyright 2006-2015 by the Sumatra team, see doc/authors.txt
-:license: CeCILL, see LICENSE for details.
+:license: BSD 2-clause, see LICENSE for details.
 """
 from __future__ import unicode_literals
 from future.standard_library import install_aliases

diff --git a/sumatra/decorators.py b/sumatra/decorators.py
@@ -8,8 +8,8 @@ def main(parameters, [other_args...]):
     <body of main function>
 
 
-:copyright: Copyright 2006-2014 by the Sumatra team, see doc/authors.txt
-:license: CeCILL, see LICENSE for details.
+:copyright: Copyright 2006-2015 by the Sumatra team, see doc/authors.txt
+:license: BSD 2-clause, see LICENSE for details.
 """
 from __future__ import unicode_literals
 

diff --git a/sumatra/dependency_finder/__init__.py b/sumatra/dependency_finder/__init__.py
@@ -9,8 +9,8 @@
 under version control.
 
 
-:copyright: Copyright 2006-2014 by the Sumatra team, see doc/authors.txt
-:license: CeCILL, see LICENSE for details.
+:copyright: Copyright 2006-2015 by the Sumatra team, see doc/authors.txt
+:license: BSD 2-clause, see LICENSE for details.
 """
 
 from __future__ import with_statement

diff --git a/sumatra/dependency_finder/core.py b/sumatra/dependency_finder/core.py
@@ -17,8 +17,8 @@
                                    series of functions in turn.
 
 
-:copyright: Copyright 2006-2014 by the Sumatra team, see doc/authors.txt
-:license: CeCILL, see LICENSE for details.
+:copyright: Copyright 2006-2015 by the Sumatra team, see doc/authors.txt
+:license: BSD 2-clause, see LICENSE for details.
 """
 from __future__ import unicode_literals
 from builtins import object

diff --git a/sumatra/dependency_finder/genesis.py b/sumatra/dependency_finder/genesis.py
@@ -23,8 +23,8 @@
              find_version()
 
 
-:copyright: Copyright 2006-2014 by the Sumatra team, see doc/authors.txt
-:license: CeCILL, see LICENSE for details.
+:copyright: Copyright 2006-2015 by the Sumatra team, see doc/authors.txt
+:license: BSD 2-clause, see LICENSE for details.
 """
 
 from __future__ import with_statement

diff --git a/sumatra/dependency_finder/matlab.py b/sumatra/dependency_finder/matlab.py
@@ -1,8 +1,8 @@
 """
 
 
-:copyright: Copyright 2006-2014 by the Sumatra team, see doc/authors.txt
-:license: CeCILL, see LICENSE for details.
+:copyright: Copyright 2006-2015 by the Sumatra team, see doc/authors.txt
+:license: BSD 2-clause, see LICENSE for details.
 """
 from __future__ import unicode_literals
 

diff --git a/sumatra/dependency_finder/neuron.py b/sumatra/dependency_finder/neuron.py
@@ -24,8 +24,8 @@
              find_version()
 
 
-:copyright: Copyright 2006-2014 by the Sumatra team, see doc/authors.txt
-:license: CeCILL, see LICENSE for details.
+:copyright: Copyright 2006-2015 by the Sumatra team, see doc/authors.txt
+:license: BSD 2-clause, see LICENSE for details.
 """
 
 from __future__ import with_statement

diff --git a/sumatra/dependency_finder/python.py b/sumatra/dependency_finder/python.py
@@ -30,8 +30,8 @@
              find_version()
 
 
-:copyright: Copyright 2006-2014 by the Sumatra team, see doc/authors.txt
-:license: CeCILL, see LICENSE for details.
+:copyright: Copyright 2006-2015 by the Sumatra team, see doc/authors.txt
+:license: BSD 2-clause, see LICENSE for details.
 """
 
 from __future__ import with_statement

diff --git a/sumatra/dependency_finder/r.py b/sumatra/dependency_finder/r.py
@@ -2,7 +2,7 @@
 
 
 :copyright: Copyright 2006-2015 by the Sumatra team, see doc/authors.txt
-:license: CeCILL, see LICENSE for details.
+:license: BSD 2-clause, see LICENSE for details.
 """
 from __future__ import unicode_literals
 

diff --git a/sumatra/formatting/__init__.py b/sumatra/formatting/__init__.py
@@ -4,8 +4,8 @@
 formats: currently text or HTML.
 
 
-:copyright: Copyright 2006-2014 by the Sumatra team, see doc/authors.txt
-:license: CeCILL, see LICENSE for details.
+:copyright: Copyright 2006-2015 by the Sumatra team, see doc/authors.txt
+:license: BSD 2-clause, see LICENSE for details.
 """
 from __future__ import unicode_literals
 from builtins import zip

diff --git a/sumatra/launch.py b/sumatra/launch.py
@@ -3,8 +3,8 @@
 obtaining information about the platform(s) on which the simulations are run.
 
 
-:copyright: Copyright 2006-2014 by the Sumatra team, see doc/authors.txt
-:license: CeCILL, see LICENSE for details.
+:copyright: Copyright 2006-2015 by the Sumatra team, see doc/authors.txt
+:license: BSD 2-clause, see LICENSE for details.
 """
 from __future__ import print_function
 from __future__ import unicode_literals

diff --git a/sumatra/parameters.py b/sumatra/parameters.py
@@ -24,8 +24,8 @@
     handles parameter files in YAML format
 
 
-:copyright: Copyright 2006-2014 by the Sumatra team, see doc/authors.txt
-:license: CeCILL, see LICENSE for details.
+:copyright: Copyright 2006-2015 by the Sumatra team, see doc/authors.txt
+:license: BSD 2-clause, see LICENSE for details.
 """
 
 from __future__ import with_statement, absolute_import

diff --git a/sumatra/pfi.py b/sumatra/pfi.py
@@ -4,8 +4,8 @@
 
 This script should be placed somewhere on the user's path.
 
-:copyright: Copyright 2006-2014 by the Sumatra team, see doc/authors.txt
-:license: CeCILL, see LICENSE for details.
+:copyright: Copyright 2006-2015 by the Sumatra team, see doc/authors.txt
+:license: BSD 2-clause, see LICENSE for details.
 """
 from __future__ import unicode_literals
 

diff --git a/sumatra/programs.py b/sumatra/programs.py
@@ -29,8 +29,8 @@
     executable file or a script file that can be run with a given tool.
 
 
-:copyright: Copyright 2006-2014 by the Sumatra team, see doc/authors.txt
-:license: CeCILL, see LICENSE for details.
+:copyright: Copyright 2006-2015 by the Sumatra team, see doc/authors.txt
+:license: BSD 2-clause, see LICENSE for details.
 """
 
 from __future__ import with_statement

diff --git a/sumatra/projects.py b/sumatra/projects.py
@@ -17,8 +17,8 @@
 load_project() - read project information from the working directory and return
                  a Project object.
 
-:copyright: Copyright 2006-2014 by the Sumatra team, see doc/authors.txt
-:license: CeCILL, see LICENSE for details.
+:copyright: Copyright 2006-2015 by the Sumatra team, see doc/authors.txt
+:license: BSD 2-clause, see LICENSE for details.
 """
 from __future__ import print_function
 from __future__ import unicode_literals

diff --git a/sumatra/publishing/latex/includefigure.py b/sumatra/publishing/latex/includefigure.py
@@ -1,8 +1,8 @@
 """
 
 
-:copyright: Copyright 2006-2014 by the Sumatra team, see doc/authors.txt
-:license: CeCILL, see LICENSE for details.
+:copyright: Copyright 2006-2015 by the Sumatra team, see doc/authors.txt
+:license: BSD 2-clause, see LICENSE for details.
 """
 from __future__ import print_function
 from __future__ import unicode_literals

diff --git a/sumatra/publishing/sphinxext/__init__.py b/sumatra/publishing/sphinxext/__init__.py
@@ -1,8 +1,8 @@
 """
 
 
-:copyright: Copyright 2006-2014 by the Sumatra team, see doc/authors.txt
-:license: CeCILL, see LICENSE for details.
+:copyright: Copyright 2006-2015 by the Sumatra team, see doc/authors.txt
+:license: BSD 2-clause, see LICENSE for details.
 """
 from __future__ import unicode_literals
 

diff --git a/sumatra/publishing/sphinxext/sumatra_rst.py b/sumatra/publishing/sphinxext/sumatra_rst.py
@@ -14,8 +14,8 @@
 The project name and recordstore directive are optional if rst2xxxx is used in a Sumatra project directory
 
 
-:copyright: Copyright 2006-2014 by the Sumatra team, see doc/authors.txt
-:license: CeCILL, see LICENSE for details.
+:copyright: Copyright 2006-2015 by the Sumatra team, see doc/authors.txt
+:license: BSD 2-clause, see LICENSE for details.
 """
 from __future__ import unicode_literals
 

diff --git a/sumatra/publishing/utils.py b/sumatra/publishing/utils.py
@@ -2,8 +2,8 @@
 Utility functions for use in publishing modules
 
 
-:copyright: Copyright 2006-2014 by the Sumatra team, see doc/authors.txt
-:license: CeCILL, see LICENSE for details.
+:copyright: Copyright 2006-2015 by the Sumatra team, see doc/authors.txt
+:license: BSD 2-clause, see LICENSE for details.
 """
 from __future__ import unicode_literals
 from builtins import object

diff --git a/sumatra/records.py b/sumatra/records.py
@@ -11,8 +11,8 @@
          new_record() method of Project.
 
 
-:copyright: Copyright 2006-2014 by the Sumatra team, see doc/authors.txt
-:license: CeCILL, see LICENSE for details.
+:copyright: Copyright 2006-2015 by the Sumatra team, see doc/authors.txt
+:license: BSD 2-clause, see LICENSE for details.
 """
 from __future__ import print_function
 from __future__ import unicode_literals

diff --git a/sumatra/recordstore/__init__.py b/sumatra/recordstore/__init__.py
@@ -11,8 +11,8 @@
 http_store   - provides the HttpRecordStore class
 
 
-:copyright: Copyright 2006-2014 by the Sumatra team, see doc/authors.txt
-:license: CeCILL, see LICENSE for details.
+:copyright: Copyright 2006-2015 by the Sumatra team, see doc/authors.txt
+:license: BSD 2-clause, see LICENSE for details.
 """
 from __future__ import unicode_literals
 

diff --git a/sumatra/recordstore/base.py b/sumatra/recordstore/base.py
@@ -2,8 +2,8 @@
 Provides base RecordStore class.
 
 
-:copyright: Copyright 2006-2014 by the Sumatra team, see doc/authors.txt
-:license: CeCILL, see LICENSE for details.
+:copyright: Copyright 2006-2015 by the Sumatra team, see doc/authors.txt
+:license: BSD 2-clause, see LICENSE for details.
 """
 from __future__ import unicode_literals
 from builtins import object

diff --git a/sumatra/recordstore/django_store/__init__.py b/sumatra/recordstore/django_store/__init__.py
@@ -5,8 +5,8 @@
 SQLite or PostgreSQL.
 
 
-:copyright: Copyright 2006-2014 by the Sumatra team, see doc/authors.txt
-:license: CeCILL, see LICENSE for details.
+:copyright: Copyright 2006-2015 by the Sumatra team, see doc/authors.txt
+:license: BSD 2-clause, see LICENSE for details.
 """
 from __future__ import absolute_import
 from __future__ import unicode_literals

diff --git a/sumatra/recordstore/django_store/models.py b/sumatra/recordstore/django_store/models.py
@@ -2,8 +2,8 @@
 Definition of database tables and object retrieval for the DjangoRecordStore.
 
 
-:copyright: Copyright 2006-2014 by the Sumatra team, see doc/authors.txt
-:license: CeCILL, see LICENSE for details.
+:copyright: Copyright 2006-2015 by the Sumatra team, see doc/authors.txt
+:license: BSD 2-clause, see LICENSE for details.
 """
 from __future__ import unicode_literals
 from builtins import str

diff --git a/sumatra/recordstore/http_store.py b/sumatra/recordstore/http_store.py
@@ -14,8 +14,8 @@
 The required JSON structure can be seen in recordstore.serialization.
 
 
-:copyright: Copyright 2006-2014 by the Sumatra team, see doc/authors.txt
-:license: CeCILL, see LICENSE for details.
+:copyright: Copyright 2006-2015 by the Sumatra team, see doc/authors.txt
+:license: BSD 2-clause, see LICENSE for details.
 """
 from __future__ import unicode_literals
 from future import standard_library