diff --git a/bin/feedback2sip b/bin/feedback2sip index a6854e36ce532b7dcae28ff2ae2e4152408306ab..bbd438c4f0228d3516f3b246a2c08e77209fc89e 100755 --- a/bin/feedback2sip +++ b/bin/feedback2sip @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -from lofar.lta.sip.feedback import main +from lofar_lta_sip.feedback import main import sys if __name__ == '__main__': diff --git a/bin/validatesip b/bin/validatesip index 9835a4e394a9377aad906e0d43eb0959f68ecd70..3c4f6b659d424f878f815e445d54081a314db4df 100755 --- a/bin/validatesip +++ b/bin/validatesip @@ -1,6 +1,6 @@ #!/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(): diff --git a/bin/visualizesip b/bin/visualizesip index eeef44d71e7bf8bfbf88863d63cef2287d0c6c52..a8694f669cd8af4106a39a5ad4b5dadc3beb5b04 100755 --- a/bin/visualizesip +++ b/bin/visualizesip @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -from lofar.lta.sip.visualizer import main +from lofar_lta_sip.visualizer import main import sys if __name__ == '__main__': diff --git a/lib/siplib.py b/lib/siplib.py index af8b6382efc450c4e6bf92f4159bd22ab89c3cfd..9d516d87838dd0209de102d6d91d768e4e1d2212 100644 --- a/lib/siplib.py +++ b/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: diff --git a/setup.py b/setup.py index 6b7ab58f8ab5e31832ed11e745a82c944df3e8cb..72fff2874608ffaa8de908a388d546d7b5170d10 100644 --- a/setup.py +++ b/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=[ diff --git a/test/example.py b/test/example.py index 4a637353fbf8d56b26d5adee386dae6e3e80ccf2..efac5bffda85b767a02dfb990b08a1a8737ea85b 100644 --- a/test/example.py +++ b/test/example.py @@ -1,6 +1,6 @@ -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' diff --git a/test/test_feedback.py b/test/test_feedback.py index 7be31b9e500813aa51fdfe8a1211ac6af4a31ad2..cb64160260a32de7bb27c12019f57ec9632dd18e 100755 --- a/test/test_feedback.py +++ b/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") diff --git a/test/test_siplib.py b/test/test_siplib.py index 53a9e3fc8bc03f552f40291ed2bcfe758f48d911..c70992b6bcbbb7d187e5541dd61d80b65e390837 100755 --- a/test/test_siplib.py +++ b/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") diff --git a/test/test_validator.py b/test/test_validator.py index 52654c7c2c7f390723c6d61ee3606cc06ec49c3b..96bbf1bfae1334f6065c63d0c659d0205bc55c4b 100755 --- a/test/test_validator.py +++ b/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") diff --git a/test/test_visualizer.py b/test/test_visualizer.py index 5eb1a340c8de51c4cc3b5baadf69db82569a82be..c911c3e1c293f98ed5401bfbfcff961ce72463ad 100755 --- a/test/test_visualizer.py +++ b/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")