fix dates and license

miketrumpis · Dec 16, 2013 · d0ce5ac · d0ce5ac
1 parent 54419e9
commit d0ce5ac
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 13 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2010-2012, Neo authors and contributors
+Copyright (c) 2010-2013, Neo 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:

diff --git a/README.rst b/README.rst
@@ -37,5 +37,5 @@ More information
 
 For installation instructions, see doc/source/install.rst
 
-:copyright: Copyright 2010-2012 by the Neo team, see AUTHORS.
-:license: Modified BSD License, see LICENSE.txt for details.
+:copyright: Copyright 2010-2013 by the Neo team, see AUTHORS.
+:license: 3-Clause Revised BSD License, see LICENSE.txt for details.
diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -40,7 +40,7 @@
 
 # General information about the project.
 project = u'Neo'
-copyright = u'2010-2012, ' + AUTHORS
+copyright = u'2010-2013, ' + AUTHORS
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -201,4 +201,4 @@
 # If false, no module index is generated.
 #latex_use_modindex = True
 
-todo_include_todos = True # set to False before releasing documentation
+todo_include_todos = True # set to False before releasing documentation
diff --git a/doc/source/gif2011workshop.rst b/doc/source/gif2011workshop.rst
@@ -89,7 +89,7 @@ packaging:
     account for more
 
 licence: 
-    BSD
+    BSD-3-Clause
 
 copyright:
     CNRS, GNode, University of Provence
@@ -100,4 +100,4 @@ hosting test data:
 Other questions discussed:
 ===========================
  - consistency in names of object attributes and get/set functions
-
+
diff --git a/doc/source/index.rst b/doc/source/index.rst
@@ -45,7 +45,7 @@ Documentation
 License
 -------
 
-Neo is distributed under a BSD licence.
+Neo is distributed under a 3-clause Revised BSD licence (BSD-3-Clause).
 
 
 Contributing

diff --git a/neo/io/axonio.py b/neo/io/axonio.py
@@ -9,7 +9,7 @@
 
 
 This code is a port of abfload and abf2load
-written in Matlab (BSD licence) by :
+written in Matlab (BSD-2-Clause licence) by :
  - Copyright (c) 2009, Forrest Collman, fcollman@princeton.edu
  - Copyright (c) 2004, Harald Hentschke
 and available here : http://www.mathworks.com/matlabcentral/fileexchange/22114-abf2load

diff --git a/setup.py b/setup.py
@@ -20,7 +20,7 @@
     author_email = "sgarcia at olfac.univ-lyon1.fr",
     description = "Neo is a package for representing electrophysiology data in Python, together with support for reading a wide range of neurophysiology file formats",
     long_description = long_description,
-    license = "BSD",
+    license = "BSD-3-Clause",
     url='http://neuralensemble.org/neo',
     classifiers = [
         'Development Status :: 4 - Beta',
@@ -32,6 +32,3 @@
         'Programming Language :: Python :: 3',
         'Topic :: Scientific/Engineering']
 )
-
-
-
-Original file line number
+Diff line change
@@ Expand Up / @@ -45,7 +45,7 @@ Documentation @@
     License
     -------
-    Neo is distributed under a BSD licence.
+    Neo is distributed under a 3-clause Revised BSD licence (BSD-3-Clause).
     Contributing
@@ Expand Down @@