Updated copyright year.

kmdouglass · Apr 25, 2018 · 471a24b · 471a24b
1 parent 8a0fdff
commit 471a24b
Show file tree

Hide file tree

Showing 26 changed files with 39 additions and 39 deletions.
diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
@@ -1,2 +1,2 @@
 © All rights reserved. ECOLE POLYTECHNIQUE FEDERALE DE LAUSANNE,
-Switzerland, Laboratory of Experimental Biophysics, 2016
+Switzerland, Laboratory of Experimental Biophysics, 2016-2018
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2016, ECOLE POLYTECHNIQUE FEDERALE DE LAUSANNE,
+Copyright (c) 2016-2018, ECOLE POLYTECHNIQUE FEDERALE DE LAUSANNE,
 Switzerland, Laboratory of Experimental Biophysics
 
 Redistribution and use in source and binary forms, with or without
@@ -26,4 +26,4 @@ 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.
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/bstore/_utils.py b/bstore/_utils.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # © All rights reserved. ECOLE POLYTECHNIQUE FEDERALE DE LAUSANNE,
-# Switzerland, Laboratory of Experimental Biophysics, 2016
+# Switzerland, Laboratory of Experimental Biophysics, 2016-2018
 # See the LICENSE.txt file for more details.
 
 """Private functions used by B-Store to facilitate its operation.

diff --git a/bstore/batch.py b/bstore/batch.py
@@ -1,5 +1,5 @@
 # © All rights reserved. ECOLE POLYTECHNIQUE FEDERALE DE LAUSANNE,
-# Switzerland, Laboratory of Experimental Biophysics, 2016
+# Switzerland, Laboratory of Experimental Biophysics, 2016-2018
 # See the LICENSE.txt file for more details.
 
 import bstore.config

diff --git a/bstore/datasetTypes/AverageFiducial.py b/bstore/datasetTypes/AverageFiducial.py
@@ -1,5 +1,5 @@
 # © All rights reserved. ECOLE POLYTECHNIQUE FEDERALE DE LAUSANNE,
-# Switzerland, Laboratory of Experimental Biophysics, 2016
+# Switzerland, Laboratory of Experimental Biophysics, 2016-2018
 # See the LICENSE.txt file for more details.
 
 import bstore.config

diff --git a/bstore/datasetTypes/FiducialTracks.py b/bstore/datasetTypes/FiducialTracks.py
@@ -1,5 +1,5 @@
 # © All rights reserved. ECOLE POLYTECHNIQUE FEDERALE DE LAUSANNE,
-# Switzerland, Laboratory of Experimental Biophysics, 2016
+# Switzerland, Laboratory of Experimental Biophysics, 2016-2018
 # See the LICENSE.txt file for more details.
 
 import bstore.config

diff --git a/bstore/datasetTypes/LocMetadata.py b/bstore/datasetTypes/LocMetadata.py
@@ -1,5 +1,5 @@
 # © All rights reserved. ECOLE POLYTECHNIQUE FEDERALE DE LAUSANNE,
-# Switzerland, Laboratory of Experimental Biophysics, 2016
+# Switzerland, Laboratory of Experimental Biophysics, 2016-2018
 # See the LICENSE.txt file for more details.
 
 import bstore.config as config

diff --git a/bstore/datasetTypes/Localizations.py b/bstore/datasetTypes/Localizations.py
@@ -1,5 +1,5 @@
 # © All rights reserved. ECOLE POLYTECHNIQUE FEDERALE DE LAUSANNE,
-# Switzerland, Laboratory of Experimental Biophysics, 2016
+# Switzerland, Laboratory of Experimental Biophysics, 2016-2018
 # See the LICENSE.txt file for more details.
 
 import bstore.config

diff --git a/bstore/datasetTypes/TestType.py b/bstore/datasetTypes/TestType.py
@@ -1,5 +1,5 @@
 # © All rights reserved. ECOLE POLYTECHNIQUE FEDERALE DE LAUSANNE,
-# Switzerland, Laboratory of Experimental Biophysics, 2016
+# Switzerland, Laboratory of Experimental Biophysics, 2016-2018
 # See the LICENSE.txt file for more details.
 
 import bstore.config

diff --git a/bstore/datasetTypes/WidefieldImage.py b/bstore/datasetTypes/WidefieldImage.py
@@ -1,5 +1,5 @@
 # © All rights reserved. ECOLE POLYTECHNIQUE FEDERALE DE LAUSANNE,
-# Switzerland, Laboratory of Experimental Biophysics, 2016
+# Switzerland, Laboratory of Experimental Biophysics, 2016-2018
 # See the LICENSE.txt file for more details.
 
 import bstore.config

diff --git a/bstore/datasetTypes/tests/AverageFiducial_tests.py b/bstore/datasetTypes/tests/AverageFiducial_tests.py
@@ -1,5 +1,5 @@
 # © All rights reserved. ECOLE POLYTECHNIQUE FEDERALE DE LAUSANNE,
-# Switzerland, Laboratory of Experimental Biophysics, 2016
+# Switzerland, Laboratory of Experimental Biophysics, 2016-2018
 # See the LICENSE.txt file for more details.
 
 """Unit tests for the testType generic dataset type.
@@ -211,4 +211,4 @@ def test_HDF_Datastore_Query_with_AverageFiducial():
         assert_equal(ds.datasetType, 'AverageFiducial')
 
     # Remove test datastore file
-    remove(str(dbName))
+    remove(str(dbName))
diff --git a/bstore/datasetTypes/tests/FiducialTracks_tests.py b/bstore/datasetTypes/tests/FiducialTracks_tests.py
@@ -1,5 +1,5 @@
 # © All rights reserved. ECOLE POLYTECHNIQUE FEDERALE DE LAUSANNE,
-# Switzerland, Laboratory of Experimental Biophysics, 2016
+# Switzerland, Laboratory of Experimental Biophysics, 2016-2018
 # See the LICENSE.txt file for more details.
 
 """Unit tests for the FiducialTracks DatasetType.
@@ -217,4 +217,4 @@ def test_HDF_Datastore_Query_with_FiducialTracks():
         assert_equal(ds.datasetType, 'FiducialTracks')
 
     # Remove test datastore file
-    remove(str(dbName))
+    remove(str(dbName))
diff --git a/bstore/datasetTypes/tests/LocMetadata_tests.py b/bstore/datasetTypes/tests/LocMetadata_tests.py
@@ -1,5 +1,5 @@
 # © All rights reserved. ECOLE POLYTECHNIQUE FEDERALE DE LAUSANNE,
-# Switzerland, Laboratory of Experimental Biophysics, 2016
+# Switzerland, Laboratory of Experimental Biophysics, 2016-2018
 # See the LICENSE.txt file for more details.
 
 """Unit tests for the LocMetadata DatasetType.
@@ -263,4 +263,4 @@ def test_HDF_Datastore_Query():
         assert_equal(ds.attributeOf, 'Localizations')
 
     # Remove test datastore file
-    remove(str(dbName))
+    remove(str(dbName))
diff --git a/bstore/datasetTypes/tests/Localizations_tests.py b/bstore/datasetTypes/tests/Localizations_tests.py
@@ -1,5 +1,5 @@
 # © All rights reserved. ECOLE POLYTECHNIQUE FEDERALE DE LAUSANNE,
-# Switzerland, Laboratory of Experimental Biophysics, 2016
+# Switzerland, Laboratory of Experimental Biophysics, 2016-2018
 # See the LICENSE.txt file for more details.
 
 """Unit tests for the Localizations DatasetType.
@@ -210,4 +210,4 @@ def test_HDF_Datastore_Query_with_Localizations():
         assert_equal(ds.datasetType, 'Localizations')
 
     # Remove test datastore file
-    remove(str(dbName))
+    remove(str(dbName))
diff --git a/bstore/datasetTypes/tests/TestType_tests.py b/bstore/datasetTypes/tests/TestType_tests.py
@@ -1,5 +1,5 @@
 # © All rights reserved. ECOLE POLYTECHNIQUE FEDERALE DE LAUSANNE,
-# Switzerland, Laboratory of Experimental Biophysics, 2016
+# Switzerland, Laboratory of Experimental Biophysics, 2016-2018
 # See the LICENSE.txt file for more details.
 
 """Unit tests for the testType generic dataset type.
@@ -127,4 +127,4 @@ def test_testType_Get_Data():
     assert_equal(myNewDS.data,                   42)
 
     # Remove the test datastore
-    remove(str(pathToDB / Path('test_db.h5')))
+    remove(str(pathToDB / Path('test_db.h5')))
diff --git a/bstore/datasetTypes/tests/WidefieldImage_tests.py b/bstore/datasetTypes/tests/WidefieldImage_tests.py
@@ -1,5 +1,5 @@
 # © All rights reserved. ECOLE POLYTECHNIQUE FEDERALE DE LAUSANNE,
-# Switzerland, Laboratory of Experimental Biophysics, 2016
+# Switzerland, Laboratory of Experimental Biophysics, 2016-2018
 # See the LICENSE.txt file for more details.
 
 """Unit tests for the WidefieldImage DatasetType.
@@ -396,4 +396,4 @@ def test_WidefieldImage_Datastore_Query():
         assert_equal(ds.datasetType, 'WidefieldImage')
 
     # Remove test datastore file
-    remove(str(dbName))
+    remove(str(dbName))
diff --git a/bstore/multiprocessors.py b/bstore/multiprocessors.py
@@ -1,5 +1,5 @@
 # © All rights reserved. ECOLE POLYTECHNIQUE FEDERALE DE LAUSANNE,
-# Switzerland, Laboratory of Experimental Biophysics, 2016
+# Switzerland, Laboratory of Experimental Biophysics, 2016-2018
 # See the LICENSE.txt file for more details.
 
 """Process multiple inputs from a SMLM experiment.

diff --git a/bstore/parsers.py b/bstore/parsers.py
@@ -1,5 +1,5 @@
 # © All rights reserved. ECOLE POLYTECHNIQUE FEDERALE DE LAUSANNE,
-# Switzerland, Laboratory of Experimental Biophysics, 2016
+# Switzerland, Laboratory of Experimental Biophysics, 2016-2018
 # See the LICENSE.txt file for more details.
 
 import pathlib

diff --git a/bstore/readers.py b/bstore/readers.py
@@ -1,5 +1,5 @@
 # © All rights reserved. ECOLE POLYTECHNIQUE FEDERALE DE LAUSANNE,
-# Switzerland, Laboratory of Experimental Biophysics, 2017
+# Switzerland, Laboratory of Experimental Biophysics, 2016-2018
 # See the LICENSE.txt file for more details.
 
 from abc import ABCMeta, abstractmethod, abstractproperty

diff --git a/bstore/tests/batch_tests.py b/bstore/tests/batch_tests.py
@@ -1,5 +1,5 @@
 # © All rights reserved. ECOLE POLYTECHNIQUE FEDERALE DE LAUSANNE,
-# Switzerland, Laboratory of Experimental Biophysics, 2016
+# Switzerland, Laboratory of Experimental Biophysics, 2016-2018
 # See the LICENSE.txt file for more details.
 
 """Unit tests for the batch module.
@@ -176,4 +176,4 @@ def test_HDFBatchProcess_Go():
     assert_equal(info[4],          'A647')
     assert_equal(info[5],            None)
     assert_equal(info[6],             [0])
-    assert_equal(info[7],            None)
+    assert_equal(info[7],            None)
diff --git a/bstore/tests/database_tests.py b/bstore/tests/database_tests.py
@@ -1,5 +1,5 @@
 # © All rights reserved. ECOLE POLYTECHNIQUE FEDERALE DE LAUSANNE,
-# Switzerland, Laboratory of Experimental Biophysics, 2016-2017
+# Switzerland, Laboratory of Experimental Biophysics, 2016-2018
 # See the LICENSE.txt file for more details.
 
 """Unit tests for the database module.
@@ -673,4 +673,4 @@ def test_HDFDatastore_Build_With_Reader():
     if dsName.exists():
         remove(str(dsName))
 
-    assert_equal(len(res), 6)
+    assert_equal(len(res), 6)
diff --git a/bstore/tests/multiprocessors_tests.py b/bstore/tests/multiprocessors_tests.py
@@ -1,5 +1,5 @@
 # © All rights reserved. ECOLE POLYTECHNIQUE FEDERALE DE LAUSANNE,
-# Switzerland, Laboratory of Experimental Biophysics, 2016
+# Switzerland, Laboratory of Experimental Biophysics, 2016-2018
 # See the LICENSE.txt file for more details.
 
 """Unit tests for the multiprocessors module.
@@ -153,4 +153,4 @@ def test_EstimatePhotons_Bad_Mask_Size():
 
     estimator = mp.EstimatePhotons(bgMaskSize = 8, spotMaskRadius = 4)
     photons, bg = estimator(imgTest, [(10, 10), (30, 40), (48, 10)])
-
+
diff --git a/bstore/tests/parsers_tests.py b/bstore/tests/parsers_tests.py
@@ -1,5 +1,5 @@
 # © All rights reserved. ECOLE POLYTECHNIQUE FEDERALE DE LAUSANNE,
-# Switzerland, Laboratory of Experimental Biophysics, 2016
+# Switzerland, Laboratory of Experimental Biophysics, 2016-2018
 # See the LICENSE.txt file for more details.
 
 """Unit tests for the parsers module.
@@ -319,4 +319,4 @@ def test_PositionParser_GetDataset_NotInitialized():
     
     """                             
     parser = parsers.PositionParser()
-    parser.dataset
+    parser.dataset
diff --git a/bstore/tests/processors_tests.py b/bstore/tests/processors_tests.py
@@ -1,5 +1,5 @@
 # © All rights reserved. ECOLE POLYTECHNIQUE FEDERALE DE LAUSANNE,
-# Switzerland, Laboratory of Experimental Biophysics, 2016
+# Switzerland, Laboratory of Experimental Biophysics, 2016-2018
 # See the LICENSE.txt file for more details.
 
 from nose.tools import ok_, assert_equal

diff --git a/bstore/tests/readers_tests.py b/bstore/tests/readers_tests.py
@@ -1,5 +1,5 @@
 # © All rights reserved. ECOLE POLYTECHNIQUE FEDERALE DE LAUSANNE,
-# Switzerland, Laboratory of Experimental Biophysics, 2016-2017
+# Switzerland, Laboratory of Experimental Biophysics, 2016-2018
 # See the LICENSE.txt file for more details.
 
 """Unit tests for the readers module.
@@ -169,4 +169,4 @@ def test_JSONReader_Works_With_Parser():
     assert_equal(parser.dataset.data['intensity'].iloc[0],4386.6)
     assert_equal(parser.dataset.data['x'].iloc[1], 7958.1)
     assert_equal(len(parser.dataset.data.columns), 9)
-    assert_equal(len(parser.dataset.data), 11)
+    assert_equal(len(parser.dataset.data), 11)
diff --git a/bstore/tests/utils_tests.py b/bstore/tests/utils_tests.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # © All rights reserved. ECOLE POLYTECHNIQUE FEDERALE DE LAUSANNE,
-# Switzerland, Laboratory of Experimental Biophysics, 2016
+# Switzerland, Laboratory of Experimental Biophysics, 2016-2018
 # See the LICENSE.txt file for more details.
 
 """Tests of private functions used by B-Store to facilitate its operation.
@@ -37,4 +37,4 @@ def test_findPlugins():
 
     # Remove the test file
     if Path(cFile).exists():
-        os.remove(cFile)
+        os.remove(cFile)