Merge branch 'TMSS-2173' into 'master'

TMSS-2173: change package name to not contain unsupported '.'

Closes TMSS-2173

See merge request !6

bin/feedback2sip

 #!/usr/bin/env python3
 
-from lofar.lta.sip.feedback import main
+from lofar_lta_sip.feedback import main
 import sys
 
 if __name__ == '__main__':

bin/validatesip

 #!/usr/bin/env python3
 from argparse import ArgumentParser
-from lofar.lta.sip.validator import main
+from lofar_lta_sip.validator import main
 
 
 def parse_args():

bin/visualizesip

 #!/usr/bin/env python3
 
-from lofar.lta.sip.visualizer import main
+from lofar_lta_sip.visualizer import main
 import sys
 
 if __name__ == '__main__':

lib/siplib.py

@@ -907,7 +907,7 @@ class CorrelatorProcessing():
         )
 
         # Somehow this does not work in the constructor:
-        self.__pyxb_rtprocessing.channelwidth = __channelwidth
+        self.__pyxb_rtprocessing.channelWidth = __channelwidth
 
     def _get_pyxb_rtprocessing(self, suppress_warning=False):
         if not suppress_warning:

setup.py

@@ -26,9 +26,9 @@ setuptools.setup(
     long_description=long_description,
     long_description_content_type="text/markdown",
     url="https://git.astron.nl/ro/siputils",
-    packages=['lofar.lta.sip'],
-    package_dir={'lofar.lta.sip': 'lib'},
-    package_data = {'lofar.lta.sip': ['etc/*.xsd','etc/.siplibrc','StationPositions.parset']},
+    packages=['lofar_lta_sip'],
+    package_dir={'lofar_lta_sip': 'lib'},
+    package_data = {'lofar_lta_sip': ['etc/*.xsd','etc/.siplibrc','StationPositions.parset']},
     include_package_data=False,
     scripts=scripts,
     classifiers=[

test/example.py

-from lofar.lta.sip import siplib
-from lofar.lta.sip import query
-from lofar.lta.sip import visualizer
+from lofar_lta_sip import siplib
+from lofar_lta_sip import query
+from lofar_lta_sip import visualizer
 import uuid
 
 input_project = '2015LOFAROBS'

test/test_feedback.py

@@ -28,7 +28,7 @@ except ImportError as e:
 
 import unittest
 import os
-from lofar.lta.sip import siplib, validator, constants, feedback
+from lofar_lta_sip import siplib, validator, constants, feedback
 from unittest.mock import patch
 
 import uuid
@@ -49,7 +49,7 @@ id_response = {"version": "version",
                "error": ''}
 
 def create_basicdoc():
-    with patch('lofar.lta.sip.siplib.query.client') as client_mock:
+    with patch('lofar_lta_sip.siplib.query.client') as client_mock:
         client_mock.GetUniqueID.return_value = id_response
         return siplib.Sip(
                 project_code = "code",
@@ -86,7 +86,7 @@ class TestSIPfeedback(unittest.TestCase):
 
     def test_dataproducts(self):
 
-        with patch('lofar.lta.sip.siplib.query.client') as client_mock:
+        with patch('lofar_lta_sip.siplib.query.client') as client_mock:
             client_mock.GetUniqueID.return_value = id_response
             mysip = create_basicdoc()
             logging.info("===\nAdding related generic dataproduct:\n")

test/test_siplib.py

@@ -30,7 +30,7 @@ except ImportError as e:
     print('Please install python3 package pyxb: sudo apt-get install python3-pyxb')
     exit(3)    # special lofar test exit code: skipped test
 
-from lofar.lta.sip import siplib, validator, constants, ltasip
+from lofar_lta_sip import siplib, validator, constants, ltasip
 import os
 import logging
 logger = logging.getLogger(__name__)
@@ -48,7 +48,7 @@ id_response = {"version": "version",
                "is_new": True,
                "error": ''}
 
-with patch('lofar.lta.sip.siplib.query.client') as client_mock:
+with patch('lofar_lta_sip.siplib.query.client') as client_mock:
     client_mock.GetUniqueID.return_value = id_response
     dp_id = siplib.Identifier("test")
     in_dpid1 = siplib.Identifier("test")

test/test_validator.py

@@ -28,7 +28,7 @@ except ImportError as e:
 
 import unittest
 import os
-from lofar.lta.sip import validator
+from lofar_lta_sip import validator
 
 VALIDFILE_PATH = os.path.join(os.path.dirname(__file__), "test_files/valid_sip.xml")
 

test/test_visualizer.py

@@ -29,8 +29,8 @@ except ImportError as e:
 import unittest
 import time
 import os
-from lofar.lta.sip import visualizer
-from lofar.lta.sip import ltasip
+from lofar_lta_sip import visualizer
+from lofar_lta_sip import ltasip
 
 INPUTFILE_PATH = os.path.join(os.path.dirname(__file__), "test_files/valid_sip.xml")