note last tagged change, update copyright years

prjemian · Jan 13, 2015 · 17854ea · 17854ea
1 parent 0d9d705
commit 17854ea
Show file tree

Hide file tree

Showing 23 changed files with 56 additions and 57 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -7,6 +7,7 @@ Change History
 Production
 **********
 
+:2015.0113.0: dropped requirement of *lxml* package
 :2014.1228.1: build mne:name cross-references for counters and positioners
 :2014.1228.0: show version in documentation
 :2014.1028.0: quietly ignore unrecognized scan content *for now*

diff --git a/README.rst b/README.rst
@@ -5,7 +5,7 @@ Converts SPEC data files and scans into NeXus HDF5 files
 
 :author:    Pete R. Jemian
 :email:     prjemian@gmail.com
-:copyright: 2014, Pete R. Jemian
+:copyright: 2014-2015, Pete R. Jemian
 :license:   Creative Commons Attribution 4.0 International Public License (see *LICENSE.txt*)
 :URL:       http://spec2nexus.readthedocs.org
 :git:       https://github.com/prjemian/spec2nexus

diff --git a/setup.py b/setup.py
@@ -4,7 +4,7 @@
 #-----------------------------------------------------------------------------
 # :author:    Pete R. Jemian
 # :email:     prjemian@gmail.com
-# :copyright: (c) 2014, Pete R. Jemian
+# :copyright: (c) 2014-2015, Pete R. Jemian
 #
 # Distributed under the terms of the Creative Commons Attribution 4.0 International Public License.
 #

diff --git a/src/spec2nexus/__init__.py b/src/spec2nexus/__init__.py
@@ -5,7 +5,7 @@
 #-----------------------------------------------------------------------------
 # :author:    Pete R. Jemian
 # :email:     prjemian@gmail.com
-# :copyright: (c) 2014, Pete R. Jemian
+# :copyright: (c) 2014-2015, Pete R. Jemian
 #
 # Distributed under the terms of the Creative Commons Attribution 4.0 International Public License.
 #

diff --git a/src/spec2nexus/dev_h5toText.py b/src/spec2nexus/dev_h5toText.py
@@ -6,7 +6,7 @@
 #-----------------------------------------------------------------------------
 # :author:    Pete R. Jemian
 # :email:     prjemian@gmail.com
-# :copyright: (c) 2014, Pete R. Jemian
+# :copyright: (c) 2014-2015, Pete R. Jemian
 #
 # Distributed under the terms of the Creative Commons Attribution 4.0 International Public License.
 #

diff --git a/src/spec2nexus/extractSpecScan.py b/src/spec2nexus/extractSpecScan.py
@@ -3,7 +3,7 @@
 #-----------------------------------------------------------------------------
 # :author:    Pete R. Jemian
 # :email:     prjemian@gmail.com
-# :copyright: (c) 2014, Pete R. Jemian
+# :copyright: (c) 2014-2015, Pete R. Jemian
 #
 # Distributed under the terms of the Creative Commons Attribution 4.0 International Public License.
 #

diff --git a/src/spec2nexus/eznx.py b/src/spec2nexus/eznx.py
@@ -4,7 +4,7 @@
 #-----------------------------------------------------------------------------
 # :author:    Pete R. Jemian
 # :email:     prjemian@gmail.com
-# :copyright: (c) 2014, Pete R. Jemian
+# :copyright: (c) 2014-2015, Pete R. Jemian
 #
 # Distributed under the terms of the Creative Commons Attribution 4.0 International Public License.
 #

diff --git a/src/spec2nexus/nexus.py b/src/spec2nexus/nexus.py
@@ -4,7 +4,7 @@
 #-----------------------------------------------------------------------------
 # :author:    Pete R. Jemian
 # :email:     prjemian@gmail.com
-# :copyright: (c) 2014, Pete R. Jemian
+# :copyright: (c) 2014-2015, Pete R. Jemian
 #
 # Distributed under the terms of the Creative Commons Attribution 4.0 International Public License.
 #

diff --git a/src/spec2nexus/plugin.py b/src/spec2nexus/plugin.py
@@ -1,6 +1,16 @@
 #!/usr/bin/env python 
 # -*- coding: utf-8 -*-
 
+#-----------------------------------------------------------------------------
+# :author:    Pete R. Jemian
+# :email:     prjemian@gmail.com
+# :copyright: (c) 2014-2015, Pete R. Jemian
+#
+# Distributed under the terms of the Creative Commons Attribution 4.0 International Public License.
+#
+# The full license is in the file LICENSE.txt, distributed with this software.
+#-----------------------------------------------------------------------------
+
 '''
 define the plug-in architecture
 
@@ -18,16 +28,6 @@
 
 '''
 
-#-----------------------------------------------------------------------------
-# :author:    Pete R. Jemian
-# :email:     prjemian@gmail.com
-# :copyright: (c) 2014, Pete R. Jemian
-#
-# Distributed under the terms of the Creative Commons Attribution 4.0 International Public License.
-#
-# The full license is in the file LICENSE.txt, distributed with this software.
-#-----------------------------------------------------------------------------
-
 
 import os                           #@UnusedImport
 import sys                          #@UnusedImport

diff --git a/src/spec2nexus/plugins/__init__.py b/src/spec2nexus/plugins/__init__.py
@@ -1,7 +1,7 @@
 #-----------------------------------------------------------------------------
 # :author:    Pete R. Jemian
 # :email:     prjemian@gmail.com
-# :copyright: (c) 2014, Pete R. Jemian
+# :copyright: (c) 2014-2015, Pete R. Jemian
 #
 # Distributed under the terms of the Creative Commons Attribution 4.0 International Public License.
 #

diff --git a/src/spec2nexus/plugins/spec_common_spec2nexus.py b/src/spec2nexus/plugins/spec_common_spec2nexus.py
@@ -1,24 +1,24 @@
 #!/usr/bin/env python 
 # -*- coding: utf-8 -*-
 
-'''
-SPEC data file standard control lines
-
-:see: SPEC manual, *Standard Data File Format*,
-   http://www.certif.com/spec_manual/user_1_4_1.html
-
-'''
-
 #-----------------------------------------------------------------------------
 # :author:    Pete R. Jemian
 # :email:     prjemian@gmail.com
-# :copyright: (c) 2014, Pete R. Jemian
+# :copyright: (c) 2014-2015, Pete R. Jemian
 #
 # Distributed under the terms of the Creative Commons Attribution 4.0 International Public License.
 #
 # The full license is in the file LICENSE.txt, distributed with this software.
 #-----------------------------------------------------------------------------
 
+'''
+SPEC data file standard control lines
+
+:see: SPEC manual, *Standard Data File Format*,
+   http://www.certif.com/spec_manual/user_1_4_1.html
+
+'''
+
 
 import re
 from spec2nexus.eznx import write_dataset, makeGroup, openGroup

diff --git a/src/spec2nexus/plugins/uim_spec2nexus.py b/src/spec2nexus/plugins/uim_spec2nexus.py
@@ -1,24 +1,24 @@
 #!/usr/bin/env python 
 # -*- coding: utf-8 -*-
 
-'''
-**#UIM** : Image header information from EPICS areaDetector
-
-:deprecated: in favor of UXML
-'''
-
-# TODO: for each ControlLineHandler, describe where data goes, both internally and in HDF5 file
-
 #-----------------------------------------------------------------------------
 # :author:    Pete R. Jemian
 # :email:     prjemian@gmail.com
-# :copyright: (c) 2014, Pete R. Jemian
+# :copyright: (c) 2014-2015, Pete R. Jemian
 #
 # Distributed under the terms of the Creative Commons Attribution 4.0 International Public License.
 #
 # The full license is in the file LICENSE.txt, distributed with this software.
 #-----------------------------------------------------------------------------
 
+'''
+**#UIM** : Image header information from EPICS areaDetector
+
+:deprecated: in favor of UXML
+'''
+
+# TODO: for each ControlLineHandler, describe where data goes, both internally and in HDF5 file
+
 '''
 #UIM Image header information from areaDetector
 #UIM UIMR: ROI information, UIMC: image counter setup

diff --git a/src/spec2nexus/plugins/unicat_spec2nexus.py b/src/spec2nexus/plugins/unicat_spec2nexus.py
@@ -1,24 +1,23 @@
 #!/usr/bin/env python 
 # -*- coding: utf-8 -*-
 
-'''
-**#H** & **#V** - Metadata in SPEC data files as defined by APS UNICAT
-
-Handles the UNICAT control lines which write additional metadata
-in the scans using #H/#V pairs of labels/values.
-'''
-
-
 #-----------------------------------------------------------------------------
 # :author:    Pete R. Jemian
 # :email:     prjemian@gmail.com
-# :copyright: (c) 2014, Pete R. Jemian
+# :copyright: (c) 2014-2015, Pete R. Jemian
 #
 # Distributed under the terms of the Creative Commons Attribution 4.0 International Public License.
 #
 # The full license is in the file LICENSE.txt, distributed with this software.
 #-----------------------------------------------------------------------------
 
+'''
+**#H** & **#V** - Metadata in SPEC data files as defined by APS UNICAT
+
+Handles the UNICAT control lines which write additional metadata
+in the scans using #H/#V pairs of labels/values.
+'''
+
 
 from spec2nexus.plugin import ControlLineHandler
 from spec2nexus.utils import strip_first_word

diff --git a/src/spec2nexus/prjPySpec.py b/src/spec2nexus/prjPySpec.py
@@ -4,7 +4,7 @@
 #-----------------------------------------------------------------------------
 # :author:    Pete R. Jemian
 # :email:     prjemian@gmail.com
-# :copyright: (c) 2014, Pete R. Jemian
+# :copyright: (c) 2014-2015, Pete R. Jemian
 #
 # Distributed under the terms of the Creative Commons Attribution 4.0 International Public License.
 #

diff --git a/src/spec2nexus/spec.py b/src/spec2nexus/spec.py
@@ -4,7 +4,7 @@
 #-----------------------------------------------------------------------------
 # :author:    Pete R. Jemian
 # :email:     prjemian@gmail.com
-# :copyright: (c) 2014, Pete R. Jemian
+# :copyright: (c) 2014-2015, Pete R. Jemian
 #
 # Distributed under the terms of the Creative Commons Attribution 4.0 International Public License.
 #

diff --git a/src/spec2nexus/test_extractSpecScan.py b/src/spec2nexus/test_extractSpecScan.py
@@ -5,7 +5,7 @@
 #-----------------------------------------------------------------------------
 # :author:    Pete R. Jemian
 # :email:     prjemian@gmail.com
-# :copyright: (c) 2014, Pete R. Jemian
+# :copyright: (c) 2014-2015, Pete R. Jemian
 #
 # Distributed under the terms of the Creative Commons Attribution 4.0 International Public License.
 #

diff --git a/src/spec2nexus/test_plugin.py b/src/spec2nexus/test_plugin.py
@@ -5,7 +5,7 @@
 #-----------------------------------------------------------------------------
 # :author:    Pete R. Jemian
 # :email:     prjemian@gmail.com
-# :copyright: (c) 2014, Pete R. Jemian
+# :copyright: (c) 2014-2015, Pete R. Jemian
 #
 # Distributed under the terms of the Creative Commons Attribution 4.0 International Public License.
 #

diff --git a/src/spec2nexus/test_spec.py b/src/spec2nexus/test_spec.py
@@ -5,7 +5,7 @@
 #-----------------------------------------------------------------------------
 # :author:    Pete R. Jemian
 # :email:     prjemian@gmail.com
-# :copyright: (c) 2014, Pete R. Jemian
+# :copyright: (c) 2014-2015, Pete R. Jemian
 #
 # Distributed under the terms of the Creative Commons Attribution 4.0 International Public License.
 #

diff --git a/src/spec2nexus/test_writer.py b/src/spec2nexus/test_writer.py
@@ -5,7 +5,7 @@
 #-----------------------------------------------------------------------------
 # :author:    Pete R. Jemian
 # :email:     prjemian@gmail.com
-# :copyright: (c) 2014, Pete R. Jemian
+# :copyright: (c) 2014-2015, Pete R. Jemian
 #
 # Distributed under the terms of the Creative Commons Attribution 4.0 International Public License.
 #

diff --git a/src/spec2nexus/utils.py b/src/spec2nexus/utils.py
@@ -5,7 +5,7 @@
 #-----------------------------------------------------------------------------
 # :author:    Pete R. Jemian
 # :email:     prjemian@gmail.com
-# :copyright: (c) 2014, Pete R. Jemian
+# :copyright: (c) 2014-2015, Pete R. Jemian
 #
 # Distributed under the terms of the Creative Commons Attribution 4.0 International Public License.
 #

diff --git a/src/spec2nexus/uxml/test_uxml.py b/src/spec2nexus/uxml/test_uxml.py
@@ -5,7 +5,7 @@
 #-----------------------------------------------------------------------------
 # :author:    Pete R. Jemian
 # :email:     prjemian@gmail.com
-# :copyright: (c) 2014, Pete R. Jemian
+# :copyright: (c) 2014-2015, Pete R. Jemian
 #
 # Distributed under the terms of the Creative Commons Attribution 4.0 International Public License.
 #
@@ -15,7 +15,6 @@
 
 import unittest
 import os
-from spec2nexus import spec
 from spec2nexus import writer
 from spec2nexus.spec import SpecDataFile, SpecDataFileScan
 from lxml import etree

diff --git a/src/spec2nexus/uxml/uxml_spec2nexus.py b/src/spec2nexus/uxml/uxml_spec2nexus.py
@@ -59,7 +59,7 @@
 #-----------------------------------------------------------------------------
 # :author:    Pete R. Jemian
 # :email:     prjemian@gmail.com
-# :copyright: (c) 2014, Pete R. Jemian
+# :copyright: (c) 2014-2015, Pete R. Jemian
 #
 # Distributed under the terms of the Creative Commons Attribution 4.0 International Public License.
 #
@@ -68,7 +68,7 @@
 
 from spec2nexus.plugin import ControlLineHandler
 from spec2nexus.utils import strip_first_word
-from spec2nexus import eznx, utils
+from spec2nexus import eznx
 from lxml import etree
 
 

diff --git a/src/spec2nexus/writer.py b/src/spec2nexus/writer.py
@@ -4,7 +4,7 @@
 #-----------------------------------------------------------------------------
 # :author:    Pete R. Jemian
 # :email:     prjemian@gmail.com
-# :copyright: (c) 2014, Pete R. Jemian
+# :copyright: (c) 2014-2015, Pete R. Jemian
 #
 # Distributed under the terms of the Creative Commons Attribution 4.0 International Public License.
 #