more restructuring

.coveragerc

@@ -1,7 +1,7 @@
 # .coveragerc to control coverage.py
 [run]
 branch = True
-source = hyo2.soundspeed
+source = hyo2.ssm2
 
 [report]
 # Regexes for lines to exclude from consideration

.travis.yml

@@ -6,14 +6,14 @@ os:
 
 env:
  - PYTHON_VERSION=3.8
- - PYTHON_VERSION=3.6
- - PYTHON_VERSION=3.7
+ - PYTHON_VERSION=3.9
+ - PYTHON_VERSION=3.10
 
 matrix:
  fast_finish: true
  allow_failures:
  - os: osx
- - env: PYTHON_VERSION=3.7
+ - env: PYTHON_VERSION=3.10
 
 install:
  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then MINICONDA_OS=Linux; else MINICONDA_OS=MacOSX; fi

HISTORY.rst

@@ -1,6 +1,14 @@
 History
 -------
 
+2024.0.0
+~~~~~~~~
+
+2024-01-26
+
+- Started migration from PySide2 to PySide6
+
+
 2020.0.0
 ~~~~~~~~
 

README.rst

@@ -2,7 +2,7 @@ HydrOffice Sound Speed
 ======================
 
 ..
- .. image:: https://img.shields.io/pypi/v/hyo2.soundspeed.svg
+ .. image:: https://img.shields.io/pypi/v/hyo2.ssm2.lib.svg
  :target: https://pypi.python.org/pypi/hyo2.soundspeed
  :alt: PyPi version
 

appveyor.yml

@@ -1,4 +1,4 @@
-version: 2022.{build}-{branch}
+version: 2024.{build}-{branch}
 
 image: Visual Studio 2015
 
@@ -10,23 +10,23 @@ environment:
  PYTHON_ARCH: x64
  MINICONDA: C:\Miniconda37-x64
 
- - PYTHON_VERSION: 3.6
+ - PYTHON_VERSION: 3.9
  PYTHON_ARCH: x64
  MINICONDA: C:\Miniconda37-x64
 
- - PYTHON_VERSION: 3.7
+ - PYTHON_VERSION: 3.10
  PYTHON_ARCH: x64
  MINICONDA: C:\Miniconda37-x64
 
 matrix:
 
  allow_failures:
 
- - PYTHON_VERSION: 3.6
+ - PYTHON_VERSION: 3.9
  PYTHON_ARCH: x64
  MINICONDA: C:\Miniconda37-x64
 
- - PYTHON_VERSION: 3.7
+ - PYTHON_VERSION: 3.10
  PYTHON_ARCH: x64
  MINICONDA: C:\Miniconda37-x64
 

docs/conf.py

@@ -29,7 +29,7 @@
 ]
 
 # Whitelist pattern for tags (set to None to ignore all tags)
-smv_tag_whitelist = r'^(stable|v\.\d+\.\d+\.\d+)$'
+smv_tag_whitelist = r'^(stable|v2\.\d+\.\d+\.\d+)$'
 
 # Whitelist pattern for branches (set to None to ignore all branches -> BUG!)
 smv_branch_whitelist = r'^None$'
@@ -57,7 +57,7 @@
 # The short X.Y version.
 version = '2024.0'
 # The full version, including alpha/beta/rc tags.
-release = '2024.0.1'
+release = '2024.0.0'
 
 numfig = True
 

docs/license.rst

@@ -2,7 +2,7 @@
 License
 *******
 
-Copyright Notice and License Terms for: hyo2.soundspeed - Sound Speed package for HydrOffice
+Copyright Notice and License Terms for: hyo2.ssm2.lib - Sound Speed package for HydrOffice
 Copyright (c) 2019, University of New Hampshire, Center for Coastal and Ocean Mapping. All rights reserved.
 Portions of this project were developed under a cooperative agreement with NOAA Coast Survey Development 
 Laboratory, and contain NOAA-developed code in the public domain.

examples/soundspeed/atlas/ex_atlases_auto_query.py

@@ -1,18 +1,16 @@
 import time
-from datetime import datetime as dt, timedelta
+from datetime import datetime as dt
 import logging
 from enum import IntEnum
 from PySide6 import QtWidgets
 
-from hyo2.abc.app.qt_progress import QtProgress
-from hyo2.abc.lib.logging import set_logging
-from hyo2.soundspeedmanager import app_info
-from hyo2.soundspeed.soundspeed import SoundSpeedLibrary
-from hyo2.soundspeedmanager.qt_callbacks import QtCallbacks
+from hyo2.abc2.app.qt_progress import QtProgress
+from hyo2.abc2.lib.logging import set_logging
+from hyo2.ssm2.lib.soundspeed import SoundSpeedLibrary
+from hyo2.ssm2.app.gui.soundspeedmanager.qt_callbacks import QtCallbacks
 
 
-ns_list = ["hyo2.soundspeed", "hyo2.soundspeedmanager", "hyo2.soundspeedsettings"]
-set_logging(ns_list=ns_list)
+set_logging(ns_list=["hyo2.abc2", "hyo2.ssm2"])
 
 logger = logging.getLogger(__name__)
 

examples/soundspeed/atlas/ex_atlases_interactive.py

@@ -2,14 +2,12 @@
 
 from PySide6 import QtWidgets
 
-from hyo2.abc.app.qt_progress import QtProgress
-from hyo2.soundspeedmanager import app_info
-from hyo2.soundspeed.soundspeed import SoundSpeedLibrary
-from hyo2.soundspeedmanager.qt_callbacks import QtCallbacks
-from hyo2.abc.lib.logging import set_logging
+from hyo2.abc2.app.qt_progress import QtProgress
+from hyo2.abc2.lib.logging import set_logging
+from hyo2.ssm2.app.gui.soundspeedmanager.qt_callbacks import QtCallbacks
+from hyo2.ssm2.lib.soundspeed import SoundSpeedLibrary
 
-ns_list = ["hyo2.soundspeed", "hyo2.soundspeedmanager", "hyo2.soundspeedsettings"]
-set_logging(ns_list=ns_list)
+set_logging(ns_list=["hyo2.abc2", "hyo2.ssm2"])
 
 logger = logging.getLogger(__name__)
 
@@ -94,4 +92,4 @@
 else:
  raise RuntimeError("invalid switch value: %s" % switch)
 
-app.exec_()
+app.exec()

examples/soundspeed/atlas/ex_atlases_offline.py

@@ -3,16 +3,13 @@
 
 from PySide6 import QtWidgets
 
-from hyo2.abc.lib.testing import Testing
-from hyo2.abc.lib.logging import set_logging
-from hyo2.abc.app.qt_progress import QtProgress
-from hyo2.soundspeedmanager import app_info
-from hyo2.soundspeed.soundspeed import SoundSpeedLibrary
-from hyo2.soundspeedmanager.qt_callbacks import QtCallbacks
+from hyo2.abc2.app.qt_progress import QtProgress
+from hyo2.abc2.lib.logging import set_logging
+from hyo2.abc2.lib.testing import Testing
+from hyo2.ssm2.app.gui.soundspeedmanager.qt_callbacks import QtCallbacks
+from hyo2.ssm2.lib.soundspeed import SoundSpeedLibrary
 
-
-ns_list = ["hyo2.soundspeed", "hyo2.soundspeedmanager", "hyo2.soundspeedsettings"]
-set_logging(ns_list=ns_list)
+set_logging(ns_list=["hyo2.abc2", "hyo2.ssm2"])
 
 logger = logging.getLogger(__name__)
 
@@ -46,7 +43,7 @@
  # (43.753190, -76.826818), # Lake Ontario
  # (47.457546, -89.347715), # Lake Superior
  # (46.161403, -124.107396), # Offshore of Colombia River
- (37.689510, -122.298514)  # San Francisco Bay
+ (37.689510, -122.298514) # San Francisco Bay
 ]
 
 test = tests[0]

examples/soundspeed/base/callbacks/ex_test_callbacks.py

@@ -1,10 +1,9 @@
 import logging
 
-from hyo2.soundspeed.base.callbacks.fake_callbacks import FakeCallbacks
+from hyo2.ssm2.lib.base.callbacks.fake_callbacks import FakeCallbacks
 from hyo2.abc2.lib.logging import set_logging
 
-ns_list = ["hyo2.soundspeed", "hyo2.soundspeedmanager", "hyo2.soundspeedsettings"]
-set_logging(ns_list=ns_list)
+set_logging(ns_list=["hyo2.abc2", "hyo2.ssm2"])
 
 logger = logging.getLogger(__name__)
 

examples/soundspeed/ex_init.py

@@ -1,15 +1,13 @@
 import logging
 
-from hyo2.soundspeedmanager import app_info
-from hyo2.soundspeed.soundspeed import SoundSpeedLibrary
+# from hyo2.ssm2.app.gui.soundspeedmanager import app_info
+from hyo2.ssm2.lib.soundspeed import SoundSpeedLibrary
 from hyo2.abc2.lib.logging import set_logging
 
-ns_list = ["hyo2.soundspeed", "hyo2.soundspeedmanager", "hyo2.soundspeedsettings"]
-set_logging(ns_list=ns_list)
+set_logging(ns_list=["hyo2.abc2", "hyo2.ssm2"])
 
 logger = logging.getLogger(__name__)
 
-
 # initialize the library
 lib = SoundSpeedLibrary()
 

examples/soundspeed/ex_new_project.py

@@ -1,11 +1,9 @@
 import logging
 
-from hyo2.soundspeedmanager import app_info
-from hyo2.soundspeed.soundspeed import SoundSpeedLibrary
 from hyo2.abc2.lib.logging import set_logging
+from hyo2.ssm2.lib.soundspeed import SoundSpeedLibrary
 
-ns_list = ["hyo2.soundspeed", "hyo2.soundspeedmanager", "hyo2.soundspeedsettings"]
-set_logging(ns_list=ns_list)
+set_logging(ns_list=["hyo2.abc2", "hyo2.ssm2"])
 
 logger = logging.getLogger(__name__)
 

examples/soundspeed/ex_plot_export_metadata.py

@@ -1,13 +1,11 @@
 import logging
 import os
 
-from hyo2.abc.lib.gdal_aux import GdalAux
-from hyo2.abc.lib.logging import set_logging
-# noinspection PyUnresolvedReferences
-from hyo2.soundspeedmanager import app_info
-from hyo2.soundspeed.soundspeed import SoundSpeedLibrary
+from hyo2.abc2.lib.gdal_aux import GdalAux
+from hyo2.abc2.lib.logging import set_logging
+from hyo2.ssm2.lib.soundspeed import SoundSpeedLibrary
 
-set_logging(ns_list=["hyo2.abc", "hyo2.soundspeed", "hyo2.soundspeedmanager", "hyo2.soundspeedsettings"])
+set_logging(ns_list=["hyo2.abc2", "hyo2.ssm2"])
 logger = logging.getLogger(__name__)
 
 # create a project
@@ -23,7 +21,7 @@
 logger.info("Profiles: %s" % len(lst))
 
 # plots/maps/exports
-# - mapt
+# - map
 lib.map_db_profiles(show_plot=True)
 lib.save_map_db_profiles()
 

examples/soundspeed/ex_read_and_store.py

@@ -1,16 +1,14 @@
-import os
 import logging
-from PySide6 import QtWidgets
+import os
+
 from matplotlib import pyplot as plt
 
-from hyo2.soundspeedmanager import app_info
-from hyo2.soundspeed.soundspeed import SoundSpeedLibrary
-from hyo2.soundspeed.base.testing import SoundSpeedTesting
-from hyo2.soundspeed.base.callbacks.fake_callbacks import FakeCallbacks
 from hyo2.abc2.lib.logging import set_logging
+from hyo2.ssm2.lib.base.callbacks.fake_callbacks import FakeCallbacks
+from hyo2.ssm2.lib.base.testing import SoundSpeedTesting
+from hyo2.ssm2.lib.soundspeed import SoundSpeedLibrary
 
-ns_list = ["hyo2.soundspeed", "hyo2.soundspeedmanager", "hyo2.soundspeedsettings"]
-set_logging(ns_list=ns_list)
+set_logging(ns_list=["hyo2.abc2", "hyo2.ssm2"])
 
 logger = logging.getLogger(__name__)
 

examples/soundspeed/ex_read_and_write.py

@@ -1,14 +1,12 @@
-import os
 import logging
+import os
 
-from hyo2.soundspeedmanager import app_info
-from hyo2.soundspeed.soundspeed import SoundSpeedLibrary
-from hyo2.soundspeed.base.testing import SoundSpeedTesting
-from hyo2.soundspeed.base.callbacks.fake_callbacks import FakeCallbacks
-from hyo2.abc.lib.logging import set_logging
+from hyo2.abc2.lib.logging import set_logging
+from hyo2.ssm2.lib.base.callbacks.fake_callbacks import FakeCallbacks
+from hyo2.ssm2.lib.base.testing import SoundSpeedTesting
+from hyo2.ssm2.lib.soundspeed import SoundSpeedLibrary
 
-ns_list = ["hyo2.soundspeed", "hyo2.soundspeedmanager", "hyo2.soundspeedsettings"]
-set_logging(ns_list=ns_list)
+set_logging(ns_list=["hyo2.abc2", "hyo2.ssm2"])
 
 logger = logging.getLogger(__name__)
 
@@ -39,7 +37,6 @@
 
 # import each identified file
 for idx, testfile in enumerate(tests.keys()):
-
  logger.info("test: * New profile: #%03d *" % idx)
 
  # import

examples/soundspeed/ex_read_and_write_abs_files.py

@@ -1,14 +1,12 @@
-import os
 import logging
+import os
 
-from hyo2.soundspeedmanager import AppInfo
-from hyo2.soundspeed.soundspeed import SoundSpeedLibrary
-from hyo2.soundspeed.base.testing import SoundSpeedTesting
-from hyo2.soundspeed.base.callbacks.fake_callbacks import FakeCallbacks
-from hyo2.abc.lib.logging import set_logging
+from hyo2.abc2.lib.logging import set_logging
+from hyo2.ssm2.lib.base.callbacks.fake_callbacks import FakeCallbacks
+from hyo2.ssm2.lib.base.testing import SoundSpeedTesting
+from hyo2.ssm2.lib.soundspeed import SoundSpeedLibrary
 
-ns_list = ["hyo2.soundspeed", "hyo2.soundspeedmanager", "hyo2.soundspeedsettings"]
-set_logging(ns_list=ns_list)
+set_logging(ns_list=["hyo2.abc2", "hyo2.ssm2"])
 
 logger = logging.getLogger(__name__)
 
@@ -38,7 +36,6 @@
 
 # import each identified file
 for idx, testfile in enumerate(tests.keys()):
-
  # # just 1 file
  # if idx != 1:
  # continue

examples/soundspeed/formats/ex_formats.py

@@ -1,10 +1,9 @@
 import logging
 
-from hyo2.soundspeed.formats import readers, writers
-from hyo2.abc.lib.logging import set_logging
+from hyo2.ssm2.lib.formats import readers, writers
+from hyo2.abc2.lib.logging import set_logging
 
-ns_list = ["hyo2.soundspeed", "hyo2.soundspeedmanager", "hyo2.soundspeedsettings"]
-set_logging(ns_list=ns_list)
+set_logging(ns_list=["hyo2.abc2", "hyo2.ssm2"])
 
 logger = logging.getLogger(__name__)
 

examples/soundspeed/listener/ex_seacat_capture.py

@@ -1,10 +1,9 @@
 import logging
 
-from hyo2.soundspeed.listener.seacat.seacat_emulator import respond
-from hyo2.abc.lib.logging import set_logging
+from hyo2.ssm2.lib.listener.seacat.seacat_emulator import respond
+from hyo2.abc2.lib.logging import set_logging
 
-ns_list = ["hyo2.soundspeed", "hyo2.soundspeedmanager", "hyo2.soundspeedsettings"]
-set_logging(ns_list=ns_list)
+set_logging(ns_list=["hyo2.abc2", "hyo2.ssm2"])
 
 logger = logging.getLogger(__name__)
 

examples/soundspeed/listener/ex_seacat_respond.py

@@ -1,11 +1,10 @@
 import os
 import logging
 
-from hyo2.soundspeed.listener.seacat.seacat_emulator import raw_capture
-from hyo2.abc.lib.logging import set_logging
+from hyo2.ssm2.lib.listener.seacat.seacat_emulator import raw_capture
+from hyo2.abc2.lib.logging import set_logging
 
-ns_list = ["hyo2.soundspeed", "hyo2.soundspeedmanager", "hyo2.soundspeedsettings"]
-set_logging(ns_list=ns_list)
+set_logging(ns_list=["hyo2.abc2", "hyo2.ssm2"])
 
 logger = logging.getLogger(__name__)