Casa6

• 

  Darrell Schiebel 26 Jan 2021 2c8f033c3b3cc1b5a32ca7dfbb570e17f894f49f

  Merge pull request #294 in CASA/casa6 from CAS-13263 to master
  * commit 'cbc32563f44a5ff99a53c0d493962e84974d0110':
    Fix Merge Conflicts
    Fix for ModuleNotFound Error in Python2
    Try / except for ModuleNotFoundError in Python2 ( Casa5)
    Add missing colon in testhelpers. Remove unused import modules. Fixed typo in np.pi. Sync CASA6 and CASA5 versions of casatestutils
    Set install requires to only six, numpy, scipy
    Add modules to install_requires
    Remove most references to is_casa6 as boolean
    Fix for th import for casatools tests
    Fixes for ModuleNotFoundError in casatools tests
    Update to new setup.py
    Check between py2 and py3 for using dict.keys
    Add 'six' to dependency list
    Replace use of testhelper and other helper files in tests to use casatestutils
    Update tests using selection_syntax, listing, filltsys to use versions in casatestutils
• 

  Akeem Wells 25 Jan 2021 cbc32563f44a5ff99a53c0d493962e84974d0110

  Merge branch 'master' into CAS-13263
  Conflicts:
          casa5/gcwrap/python/scripts/tests/test_gencal.py
          casatasks/tests/tasks/test_gencal.py
• 

  Akeem Wells 25 Jan 2021 a8bb0c631b57b5c0b568450c15601ac6eee12ee2 m

  Fix Merge Conflicts

  • casa5/gcwrap/python/scripts/tests/test_gencal.py (version a8bb0c631b57b5c0b568450c15601ac6eee12ee2) (diffs)
  • casatasks/tests/tasks/test_gencal.py (version a8bb0c631b57b5c0b568450c15601ac6eee12ee2) (diffs)
• 

  Akeem Wells <awells@humite.local> 24 Jan 2021 77441b49be19094f625571a501757ec8ca7cd44b m

  Fix for ModuleNotFound Error in Python2

  • casa5/gcwrap/python/scripts/tests/test_req_task_statwt.py (version 77441b49be19094f625571a501757ec8ca7cd44b) (diffs)
  • casatasks/tests/tasks/test_req_task_statwt.py (version 77441b49be19094f625571a501757ec8ca7cd44b) (diffs)
• 

  Akeem Wells 22 Jan 2021 4182c0403f4872e8f31b6f66ce6b96456acd1b8e m

  Merge branch 'master' into CAS-13263
• 

  Akeem Wells 22 Jan 2021 f8c95b6a808bd113c3fd7011f608a2ee6fa18b5c m

  Try / except for ModuleNotFoundError in Python2 ( Casa5)

  • casa5/gcwrap/python/scripts/casatestutils/__init__.py (version f8c95b6a808bd113c3fd7011f608a2ee6fa18b5c) (diffs)
  • casatestutils/casatestutils/__init__.py (version f8c95b6a808bd113c3fd7011f608a2ee6fa18b5c) (diffs)
• 

  Akeem Wells 20 Jan 2021 b07a2b6445c9ed78e292f6207fd48e31dd56c846 m

  Merge branch 'master' into CAS-13263
• 

  Akeem Wells 20 Jan 2021 d8200510c4c924a36da9daaee22971213d7c27fe m

  Add missing colon in testhelpers. Remove unused import modules. Fixed typo in np.pi. Sync CASA6 and CASA5 versions of casatestutils

  • casa5/gcwrap/python/scripts/casatestutils/__init__.py (version d8200510c4c924a36da9daaee22971213d7c27fe) (diffs)
  • casa5/gcwrap/python/scripts/casatestutils/extractcasascript.py (version d8200510c4c924a36da9daaee22971213d7c27fe) (diffs)
  • casa5/gcwrap/python/scripts/casatestutils/imagerhelpers/imagetesthelpers.py (version d8200510c4c924a36da9daaee22971213d7c27fe) (diffs)
  • casa5/gcwrap/python/scripts/casatestutils/testhelper.py (version d8200510c4c924a36da9daaee22971213d7c27fe) (diffs)
  • casa5/gcwrap/python/scripts/casatestutils/weblog.py (version d8200510c4c924a36da9daaee22971213d7c27fe) (diffs)
  • casatestutils/casatestutils/testhelper.py (version d8200510c4c924a36da9daaee22971213d7c27fe) (diffs)
  • casatestutils/casatestutils/weblog.py (version d8200510c4c924a36da9daaee22971213d7c27fe) (diffs)
• 

  Akeem Wells <awells@humite.local> 19 Jan 2021 0b34477c2044630c97283e8d1a903a39ed802e86 m

  Merge branch 'master' into CAS-13263
• 

  Akeem Wells <awells@humite.local> 19 Jan 2021 bcebaa62a039bd960e195e9c27016792be9c8494 m

  Set install requires to only six, numpy, scipy

  • casatestutils/setup.py (version bcebaa62a039bd960e195e9c27016792be9c8494) (diffs)
• 

  Akeem Wells 13 Jan 2021 dc39ae7bf3dd20430ff3d67dc3fa36cb7b0d0d4a m

  Merge branch 'master' into CAS-13263
• 

  Akeem Wells 13 Jan 2021 6f308b819c39c74a48133c3ca58e6f32df57a98d m

  Add modules to install_requires

  • casatestutils/setup.py (version 6f308b819c39c74a48133c3ca58e6f32df57a98d) (diffs)
• 

  Akeem Wells 11 Jan 2021 0f33fd29a61b117647efd79ab817ab8f7fe9b7db m

  Remove most references to is_casa6 as boolean

  • casa5/gcwrap/python/scripts/tests/test_req_task_statwt.py (version 0f33fd29a61b117647efd79ab817ab8f7fe9b7db) (diffs)
  • casa5/gcwrap/python/scripts/tests/test_req_tool_ms_statwt.py (version 0f33fd29a61b117647efd79ab817ab8f7fe9b7db) (diffs)
  • casatasks/tests/tasks/test_req_task_statwt.py (version 0f33fd29a61b117647efd79ab817ab8f7fe9b7db) (diffs)
  • casatestutils/casatestutils/__init__.py (version 0f33fd29a61b117647efd79ab817ab8f7fe9b7db) (diffs)
  • casatools/tests/tools/ms/test_req_tool_ms_statwt.py (version 0f33fd29a61b117647efd79ab817ab8f7fe9b7db) (diffs)
• 

  Akeem Wells <awells@humite.local> 11 Jan 2021 2f5acdf0729d6b6159b2d495021024667273e548 m

  Merge branch 'master' into CAS-13263
• 

  Akeem Wells <awells@humite.local> 11 Jan 2021 86e8bdd58b7d943fa8aaee0f317cd0b5b652b376 m

  Fix for th import for casatools tests

  • casa5/gcwrap/python/scripts/tests/test_req_tool_ms_statwt.py (version 86e8bdd58b7d943fa8aaee0f317cd0b5b652b376) (diffs)
  • casatools/tests/tools/ms/test_req_tool_ms_statwt.py (version 86e8bdd58b7d943fa8aaee0f317cd0b5b652b376) (diffs)
• 

  Akeem Wells 08 Jan 2021 5437f79a0e54b35fc4be81b05ade9467c7f77a63 m

  Fixes for ModuleNotFoundError in casatools tests

  • casatestutils/casatestutils/__init__.py (version 5437f79a0e54b35fc4be81b05ade9467c7f77a63) (diffs)
  • casatools/tests/tools/ms/test_req_tool_ms_statwt.py (version 5437f79a0e54b35fc4be81b05ade9467c7f77a63) (diffs)
• 

  Akeem Wells 08 Jan 2021 bb44b50b07fc2a30754ae5535db0b63e605b0a99 m

  Merge branch 'master' into CAS-13263
• 

  Akeem Wells 08 Jan 2021 07ec4c34c3a48bdf74bd5afdd71d55a337d40dc2 m

  Update to new setup.py

  • casatestutils/setup.py (version 07ec4c34c3a48bdf74bd5afdd71d55a337d40dc2) (diffs)
• 

  Akeem Wells <awells@humite.local> 17 Dec 2020 670c5869ee31ad4aa66498458b33cd231b52ebc5 m

  Check between py2 and py3 for using dict.keys

  • casa5/gcwrap/python/scripts/casatestutils/testhelper.py (version 670c5869ee31ad4aa66498458b33cd231b52ebc5) (diffs)
  • casatestutils/casatestutils/testhelper.py (version 670c5869ee31ad4aa66498458b33cd231b52ebc5) (diffs)
• 

  Akeem Wells <awells@humite.local> 17 Dec 2020 8ce032a72a5b8ef480f2b02ba48f21bc7b2d5241 m

  Merge branch 'master' into CAS-13263
• 

  Akeem Wells <awells@humite.local> 15 Dec 2020 c81467972bf279f9b2a57a161b0f43de85fbad9c m

  Add 'six' to dependency list

  • casatestutils/setup.py (version c81467972bf279f9b2a57a161b0f43de85fbad9c) (diffs)
• 

  Akeem Wells 08 Dec 2020 25e6a0d134c032120a441c46c8569b8d2e9fb1b4 m

  Replace use of testhelper and other helper files in tests to use casatestutils

  • casa5/gcwrap/python/scripts/casatestutils/testhelper.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casa5/gcwrap/python/scripts/casatestutils/xmlhelper.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casa5/gcwrap/python/scripts/tests/test_bandpass.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casa5/gcwrap/python/scripts/tests/test_caltabconvert.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casa5/gcwrap/python/scripts/tests/test_exportasdm.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casa5/gcwrap/python/scripts/tests/test_flagdata.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casa5/gcwrap/python/scripts/tests/test_fluxscale.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casa5/gcwrap/python/scripts/tests/test_fringefit.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casa5/gcwrap/python/scripts/tests/test_gencal.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casa5/gcwrap/python/scripts/tests/test_hanningsmooth.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casa5/gcwrap/python/scripts/tests/test_importasdm.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casa5/gcwrap/python/scripts/tests/test_importasdm_mms.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casa5/gcwrap/python/scripts/tests/test_mstransform.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casa5/gcwrap/python/scripts/tests/test_mstransform_mms.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casa5/gcwrap/python/scripts/tests/test_nrobeamaverage.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casa5/gcwrap/python/scripts/tests/test_partition.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casa5/gcwrap/python/scripts/tests/test_req_task_gaincal.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casa5/gcwrap/python/scripts/tests/test_req_task_statwt.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casa5/gcwrap/python/scripts/tests/test_req_tool_ms_statwt.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casa5/gcwrap/python/scripts/tests/test_sdcal.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casa5/gcwrap/python/scripts/tests/test_sdfit.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casa5/gcwrap/python/scripts/tests/test_sdgaincal.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casa5/gcwrap/python/scripts/tests/test_sdimaging.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casa5/gcwrap/python/scripts/tests/test_sdpolaverage.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casa5/gcwrap/python/scripts/tests/test_sdsmooth.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casa5/gcwrap/python/scripts/tests/test_split.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casa5/gcwrap/python/scripts/tests/test_tsdimaging.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casa5/gcwrap/python/scripts/tests/test_wvrgcal.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casatasks/tests/tasks/test_bandpass.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casatasks/tests/tasks/test_exportasdm.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casatasks/tests/tasks/test_flagdata.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casatasks/tests/tasks/test_fluxscale.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casatasks/tests/tasks/test_fringefit.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casatasks/tests/tasks/test_gencal.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casatasks/tests/tasks/test_hanningsmooth.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casatasks/tests/tasks/test_importasdm.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casatasks/tests/tasks/test_mstransform.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casatasks/tests/tasks/test_nrobeamaverage.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casatasks/tests/tasks/test_partition.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casatasks/tests/tasks/test_plotprofilemap.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casatasks/tests/tasks/test_req_task_gaincal.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casatasks/tests/tasks/test_req_task_sdintimaging.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casatasks/tests/tasks/test_req_task_statwt.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casatasks/tests/tasks/test_sdcal.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casatasks/tests/tasks/test_sdfit.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casatasks/tests/tasks/test_sdgaincal.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casatasks/tests/tasks/test_sdimaging.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casatasks/tests/tasks/test_sdsmooth.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casatasks/tests/tasks/test_sdtimeaverage.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casatasks/tests/tasks/test_split.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casatasks/tests/tasks/test_tsdimaging.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casatestutils/casatestutils/testhelper.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casatestutils/casatestutils/xmlhelper.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casatestutils/setup.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casatools/tests/tools/ms/test_req_tool_ms_statwt.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casatools/tests/tools/sdm/test_sdm_fromms.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
  • casatools/tests/tools/sdm/test_sdm_toms.py (version 25e6a0d134c032120a441c46c8569b8d2e9fb1b4) (diffs)
• 

  Akeem Wells 19 Nov 2020 9dbc587e84777334a6537b520bfe84d2debbe7ce m

  Update tests using selection_syntax, listing, filltsys to use versions in casatestutils

  • casa5/gcwrap/python/scripts/casatestutils/filltsys.py (version 9dbc587e84777334a6537b520bfe84d2debbe7ce) (diffs)
  • casa5/gcwrap/python/scripts/tests/test_listvis.py (version 9dbc587e84777334a6537b520bfe84d2debbe7ce) (diffs)
  • casa5/gcwrap/python/scripts/tests/test_req_task_listobs.py (version 9dbc587e84777334a6537b520bfe84d2debbe7ce) (diffs)
  • casa5/gcwrap/python/scripts/tests/test_sdbaseline.py (version 9dbc587e84777334a6537b520bfe84d2debbe7ce) (diffs)
  • casa5/gcwrap/python/scripts/tests/test_sdcal.py (version 9dbc587e84777334a6537b520bfe84d2debbe7ce) (diffs)
  • casa5/gcwrap/python/scripts/tests/test_sdfit.py (version 9dbc587e84777334a6537b520bfe84d2debbe7ce) (diffs)
  • casa5/gcwrap/python/scripts/tests/test_sdimaging.py (version 9dbc587e84777334a6537b520bfe84d2debbe7ce) (diffs)
  • casa5/gcwrap/python/scripts/tests/test_tsdimaging.py (version 9dbc587e84777334a6537b520bfe84d2debbe7ce) (diffs)
  • casatasks/tests/tasks/test_listvis.py (version 9dbc587e84777334a6537b520bfe84d2debbe7ce) (diffs)
  • casatasks/tests/tasks/test_req_task_listobs.py (version 9dbc587e84777334a6537b520bfe84d2debbe7ce) (diffs)
  • casatasks/tests/tasks/test_sdbaseline.py (version 9dbc587e84777334a6537b520bfe84d2debbe7ce) (diffs)
  • casatasks/tests/tasks/test_sdcal.py (version 9dbc587e84777334a6537b520bfe84d2debbe7ce) (diffs)
  • casatasks/tests/tasks/test_sdfit.py (version 9dbc587e84777334a6537b520bfe84d2debbe7ce) (diffs)
  • casatasks/tests/tasks/test_sdimaging.py (version 9dbc587e84777334a6537b520bfe84d2debbe7ce) (diffs)
  • casatasks/tests/tasks/test_tsdimaging.py (version 9dbc587e84777334a6537b520bfe84d2debbe7ce) (diffs)
  • casatestutils/casatestutils/filltsys.py (version 9dbc587e84777334a6537b520bfe84d2debbe7ce) (diffs)
  • casatestutils/setup.py (version 9dbc587e84777334a6537b520bfe84d2debbe7ce) (diffs)