initial work for Pyside6

.github/workflows/ssm_on_linux.yml

@@ -24,7 +24,7 @@ jobs:
  conda config --add channels conda-forge
  conda install appdirs bidict cartopy gdal matplotlib-base numpy psutil pyproj
  conda install gsw netCDF4 pillow pyserial scipy
- pip install PySide2
+ pip install PySide6
  pip install https://github.com/hydroffice/hyo2_abc/archive/master.zip
  pip install --no-deps .
  - name: Lint with flake8

.github/workflows/ssm_on_macos.yml

@@ -26,7 +26,7 @@ jobs:
  sudo -H conda config --add channels conda-forge
  sudo -H conda install appdirs bidict cartopy gdal matplotlib-base numpy psutil pyproj gsw netCDF4 pillow pyserial scipy
  sudo -H pip install --upgrade --force-reinstall pip wheel setuptools
- sudo -H pip install PySide2
+ sudo -H pip install PySide6
  sudo -H pip install --no-deps https://github.com/hydroffice/hyo2_abc/archive/master.zip
  sudo -H pip install --no-deps .
  - name: Lint with flake8

.github/workflows/ssm_on_windows.yml

@@ -24,7 +24,7 @@ jobs:
  conda config --add channels conda-forge
  conda install appdirs bidict cartopy gdal matplotlib-base numpy psutil pyproj
  conda install gsw netCDF4 pillow pyserial scipy
- pip install PySide2
+ pip install PySide6
  pip install https://github.com/hydroffice/hyo2_abc/archive/master.zip
  pip install --no-deps .
  - name: Lint with flake8

.travis.yml

@@ -29,14 +29,14 @@ install:
  - python --version
 
  - pip install coveralls PyYAML pytest pytest-cov wheel
- # for hyo2.abc
+ # for hyo2.abc2
  - conda install appdirs bidict cartopy gdal matplotlib-base numpy psutil pyproj
- - pip install PySide2
+ - pip install PySide6
  - pip install https://github.com/hydroffice/hyo2_abc/archive/master.zip
  # for hyo2.soundspeed
  - conda install gsw netCDF4 pillow pyserial scipy
 
- # --no-deps because of pip not detecting the installed hyo2.abc
+ # --no-deps because of pip not detecting the installed hyo2.abc2
  - pip install --no-deps .
  - conda list --show-channel-urls
 

appveyor.yml

@@ -45,16 +45,16 @@ install:
  - python --version
 
  - pip install coveralls PyYAML pytest pytest-cov wheel
- # for hyo2.abc
+ # for hyo2.abc2
  - conda install appdirs bidict cartopy "gdal<3.0.0" matplotlib-base numpy psutil pyproj
- - pip install PySide2
+ - pip install PySide6
  # for hyo2.soundspeed
  - conda install gsw netCDF4 pillow pyserial scipy
  - pip install https://github.com/hydroffice/hyo2_abc/archive/master.zip
 
 build: off
 build_script:
- # --no-deps because of pip not detecting the installed hyo2.abc
+ # --no-deps because of pip not detecting the installed hyo2.abc2
  - pip install --no-deps .
  - conda list --show-channel-urls
 

data/download_data.py

@@ -1,7 +1,7 @@
 import logging
 import os.path
 import shutil
-from hyo2.abc.lib.ftp import Ftp
+from hyo2.abc2.lib.ftp import Ftp
 
 logging.basicConfig(level=logging.DEBUG,
  format="%(levelname)-9s %(name)s.%(funcName)s:%(lineno)d > %(message)s")

examples/soundspeed/atlas/ex_atlases_auto_query.py

@@ -2,7 +2,7 @@
 from datetime import datetime as dt, timedelta
 import logging
 from enum import IntEnum
-from PySide2 import QtWidgets
+from PySide6 import QtWidgets
 
 from hyo2.abc.app.qt_progress import QtProgress
 from hyo2.abc.lib.logging import set_logging

examples/soundspeed/atlas/ex_atlases_interactive.py

@@ -1,6 +1,6 @@
 import logging
 
-from PySide2 import QtWidgets
+from PySide6 import QtWidgets
 
 from hyo2.abc.app.qt_progress import QtProgress
 from hyo2.soundspeedmanager import app_info

examples/soundspeed/atlas/ex_atlases_offline.py

@@ -1,7 +1,7 @@
 import logging
 import os
 
-from PySide2 import QtWidgets
+from PySide6 import QtWidgets
 
 from hyo2.abc.lib.testing import Testing
 from hyo2.abc.lib.logging import set_logging

examples/soundspeed/base/callbacks/ex_test_callbacks.py

@@ -1,7 +1,7 @@
 import logging
 
 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
 
 ns_list = ["hyo2.soundspeed", "hyo2.soundspeedmanager", "hyo2.soundspeedsettings"]
 set_logging(ns_list=ns_list)

examples/soundspeed/ex_init.py

@@ -2,7 +2,7 @@
 
 from hyo2.soundspeedmanager import app_info
 from hyo2.soundspeed.soundspeed import SoundSpeedLibrary
-from hyo2.abc.lib.logging import set_logging
+from hyo2.abc2.lib.logging import set_logging
 
 ns_list = ["hyo2.soundspeed", "hyo2.soundspeedmanager", "hyo2.soundspeedsettings"]
 set_logging(ns_list=ns_list)

examples/soundspeed/ex_new_project.py

@@ -2,7 +2,7 @@
 
 from hyo2.soundspeedmanager import app_info
 from hyo2.soundspeed.soundspeed import SoundSpeedLibrary
-from hyo2.abc.lib.logging import set_logging
+from hyo2.abc2.lib.logging import set_logging
 
 ns_list = ["hyo2.soundspeed", "hyo2.soundspeedmanager", "hyo2.soundspeedsettings"]
 set_logging(ns_list=ns_list)

examples/soundspeed/ex_read_and_store.py

@@ -1,13 +1,13 @@
 import os
 import logging
-from PySide2 import QtWidgets
+from PySide6 import QtWidgets
 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.abc.lib.logging import set_logging
+from hyo2.abc2.lib.logging import set_logging
 
 ns_list = ["hyo2.soundspeed", "hyo2.soundspeedmanager", "hyo2.soundspeedsettings"]
 set_logging(ns_list=ns_list)

examples/soundspeed/profile/ex_profile_ops.py

@@ -1,7 +1,7 @@
 import logging
 
 import numpy as np
-from PySide2 import QtWidgets
+from PySide6 import QtWidgets
 from matplotlib import pyplot as plt
 
 from hyo2.soundspeed.profile.profile import Profile

examples/soundspeedmanager/dialogs/ex_flaggable_input_dialog.py

@@ -1,5 +1,5 @@
 import logging
-from PySide2 import QtWidgets
+from PySide6 import QtWidgets
 
 from hyo2.soundspeedmanager.dialogs.flaggable_input_dialog import FlaggableInputDialog
 from hyo2.abc.lib.logging import set_logging

examples/soundspeedmanager/dialogs/ex_formatted_input_dialog.py

@@ -1,4 +1,4 @@
-from PySide2 import QtWidgets
+from PySide6 import QtWidgets
 
 import logging
 

examples/soundspeedmanager/ex_multi_selection_dialog.py

@@ -1,6 +1,6 @@
 import logging
 
-from PySide2 import QtWidgets
+from PySide6 import QtWidgets
 
 from hyo2.soundspeedmanager.dialogs.multi_selection_dialog import MultiSelectionDialog
 from hyo2.abc.lib.logging import set_logging

examples/soundspeedmanager/ex_run_qt_callbacks.py

@@ -1,4 +1,4 @@
-from PySide2 import QtWidgets
+from PySide6 import QtWidgets
 
 import logging
 

examples/soundspeedmanager/ex_run_qt_progress.py

@@ -1,7 +1,7 @@
 import logging
 import time
 
-from PySide2 import QtWidgets
+from PySide6 import QtWidgets
 
 from hyo2.abc.app.qt_progress import QtProgress
 

examples/soundspeedmanager/ex_text_editor_dialog.py

@@ -1,4 +1,4 @@
-from PySide2 import QtWidgets
+from PySide6 import QtWidgets
 
 import logging
 

examples/workground/ex_plot_rtofs.py

@@ -1,7 +1,7 @@
 import os
 import logging
 from hyo2.soundspeedmanager import AppInfo
-from PySide2 import QtWidgets
+from PySide6 import QtWidgets
 from mpl_toolkits.basemap import Basemap
 import numpy as np
 from matplotlib import pyplot as plt

freeze/SSM_SIS.spec

@@ -104,10 +104,10 @@ output_folder = os.path.join("cartopy", "data", "shapefiles", "natural_earth", "
 cartopy_data = collect_folder_data(input_data_folder=share_folder, relative_output_folder=output_folder,
  recursively=True)
 
-abc_data = collect_pkg_data('hyo2.abc')
+abc_data = collect_pkg_data('hyo2.abc2')
 ss_data = collect_pkg_data('hyo2.soundspeed')
 ssm_sis_data = collect_pkg_data('hyo2.ssm_sis')
-pyside2_data = collect_pkg_data('PySide2')
+pyside6_data = collect_pkg_data('PySide6')
 
 icon_file = os.path.normpath(os.path.join(os.getcwd(), 'freeze', 'SSM_SIS.ico'))
 if is_darwin:
@@ -116,7 +116,7 @@ if is_darwin:
 a = Analysis(['SSM_SIS.py'],
  binaries=[],
  pathex=[],
- hiddenimports=["PIL", "scipy._lib.messagestream", "cftime._cftime", "PySide2.QtPrintSupport",
+ hiddenimports=["PIL", "scipy._lib.messagestream", "cftime._cftime", "PySide6.QtPrintSupport",
  "pyproj.datadir", "pkg_resources.py2_warn"],
  excludes=["IPython", "PyQt4", "PyQt5", "pandas", "sphinx", "sphinx_rtd_theme", "OpenGL_accelerate",
  "FixTk", "tcl", "tk", "_tkinter", "tkinter", "Tkinter", "wx",
@@ -135,15 +135,15 @@ exe = EXE(pyz,
  console=True,
  icon=icon_file)
 coll = COLLECT(exe,
- a.binaries,
- a.zipfiles,
- a.datas,
- pyproj_data,
- cartopy_data,
- abc_data,
- ss_data,
- ssm_sis_data,
- pyside2_data,
- strip=None,
- upx=True,
- name='SSM_SIS.%s%s' % (ssm_version, beta))
+  a.binaries,
+  a.zipfiles,
+  a.datas,
+  pyproj_data,
+  cartopy_data,
+  abc_data,
+  ss_data,
+  ssm_sis_data,
+  pyside6_data,
+  strip=None,
+  upx=True,
+  name='SSM_SIS.%s%s' % (ssm_version, beta))

freeze/SoundSpeedManager.spec

@@ -106,11 +106,11 @@ output_folder = os.path.join("cartopy", "data", "shapefiles", "natural_earth", "
 cartopy_data = collect_folder_data(input_data_folder=share_folder, relative_output_folder=output_folder,
  recursively=True)
 
-abc_data = collect_pkg_data('hyo2.abc')
+abc_data = collect_pkg_data('hyo2.abc2')
 ss_data = collect_pkg_data('hyo2.soundspeed')
 ssm_data = collect_pkg_data('hyo2.soundspeedmanager')
 sss_data = collect_pkg_data('hyo2.soundspeedsettings')
-pyside2_data = collect_pkg_data('PySide2')
+pyside6_data = collect_pkg_data('PySide6')
 try:
  sdm_data = collect_pkg_data('hyo2.surveydatamonitor')
 except ImportError:
@@ -123,9 +123,9 @@ if is_darwin:
 
 a = Analysis(['SoundSpeedManager.py'],
  pathex=[],
- hiddenimports=["PIL", "scipy._lib.messagestream", "cftime._cftime", "PySide2.QtPrintSupport",
+ hiddenimports=["PIL", "scipy._lib.messagestream", "cftime._cftime", "PySide6.QtPrintSupport",
  "pyproj.datadir", "pkg_resources.py2_warn"],
- excludes=["IPython", "PyQt4", "PyQt5", "PyQt6", "PySide6", "qgis",
+ excludes=["IPython", "PyQt4", "PyQt5", "PyQt6", "PySide2", "qgis",
  "pandas", "sphinx", "sphinx_rtd_theme", "OpenGL_accelerate",
  "FixTk", "tcl", "tk", "_tkinter", "tkinter", "Tkinter", "wx",
  "cartopy_offlinedata", "cartopy_userconfig"],
@@ -153,7 +153,7 @@ coll = COLLECT(exe,
  ss_data,
  ssm_data,
  sss_data,
- pyside2_data,
+ pyside6_data,
  strip=None,
  upx=True,
  name='SoundSpeedManager.%s%s' % (ssm_version, beta))

freeze/to_be_added/qt.conf

@@ -1,2 +1,2 @@
 [Paths]
-Prefix = PySide2
+Prefix = PySide6

hyo2/soundspeed/__init__.py

@@ -5,15 +5,15 @@
 
 import os
 import logging
-from hyo2.abc.lib.lib_info import LibInfo
+from hyo2.abc2.lib.lib_info import LibInfo
 
 
 logger = logging.getLogger(__name__)
 logger.addHandler(logging.NullHandler())
 
 name = "Sound Speed"
-__version__ = '2023.0.10'
-__copyright__ = 'Copyright 2023 University of New Hampshire, Center for Coastal and Ocean Mapping'
+__version__ = '2024.0.0'
+__copyright__ = 'Copyright 2024 University of New Hampshire, Center for Coastal and Ocean Mapping'
 
 lib_info = LibInfo()
 
@@ -35,7 +35,7 @@
 lib_info.lib_latest_url = "https://www.hydroffice.org/latest/soundspeed.txt"
 
 lib_info.lib_dep_dict = {
- "hyo2.abc": "hyo2.abc",
+ "hyo2.abc22": "hyo2.abc2",
  "hyo2.soundspeed": "hyo2.soundspeed",
  "hyo2.surveydatamonitor": "hyo2.surveydatamonitor",
  "gsw": "gsw",
@@ -45,5 +45,5 @@
  "pyproj": "pyproj",
  "matplotlib": "matplotlib",
  "cartopy": "cartopy",
- "PySide2": "PySide2"
+ "PySide6": "PySide6"
 }

hyo2/soundspeed/atlas/regofsoffline.py

@@ -9,7 +9,7 @@
 from hyo2.soundspeed.profile.dicts import Dicts
 from hyo2.soundspeed.profile.profile import Profile
 from hyo2.soundspeed.profile.profilelist import ProfileList
-from hyo2.abc.lib.progress.cli_progress import CliProgress
+from hyo2.abc2.lib.progress.cli_progress import CliProgress
 if TYPE_CHECKING:
  from hyo2.soundspeed.soundspeed import SoundSpeedLibrary
 

hyo2/soundspeed/atlas/regofsonline.py

@@ -9,7 +9,7 @@
 from netCDF4 import Dataset, num2date
 import numpy as np
 
-from hyo2.abc.lib.progress.cli_progress import CliProgress
+from hyo2.abc2.lib.progress.cli_progress import CliProgress
 
 from hyo2.soundspeed.atlas.abstract import AbstractAtlas
 from hyo2.soundspeed.profile.profile import Profile

hyo2/soundspeed/atlas/rtofs.py

@@ -6,7 +6,7 @@
 import numpy as np
 import requests
 
-from hyo2.abc.lib.progress.cli_progress import CliProgress
+from hyo2.abc2.lib.progress.cli_progress import CliProgress
 
 from hyo2.soundspeed.atlas.abstract import AbstractAtlas
 from hyo2.soundspeed.profile.profile import Profile

hyo2/soundspeed/atlas/woa09.py

@@ -6,7 +6,7 @@
 from datetime import datetime as dt
 from typing import Union, TYPE_CHECKING
 
-from hyo2.abc.lib.onedrive import OneDrive
+from hyo2.abc2.lib.onedrive import OneDrive
 
 from hyo2.soundspeed.atlas.abstract import AbstractAtlas
 from hyo2.soundspeed.profile.profile import Profile

hyo2/soundspeed/atlas/woa13.py

@@ -6,7 +6,7 @@
 from datetime import datetime as dt
 from typing import Union, TYPE_CHECKING
 
-from hyo2.abc.lib.onedrive import OneDrive
+from hyo2.abc2.lib.onedrive import OneDrive
 
 from hyo2.soundspeed.atlas.abstract import AbstractAtlas
 from hyo2.soundspeed.profile.profile import Profile

hyo2/soundspeed/atlas/woa18.py

@@ -6,7 +6,7 @@
 from datetime import datetime as dt
 from typing import Union, TYPE_CHECKING
 
-from hyo2.abc.lib.onedrive import OneDrive
+from hyo2.abc2.lib.onedrive import OneDrive
 
 from hyo2.soundspeed.atlas.abstract import AbstractAtlas
 from hyo2.soundspeed.profile.profile import Profile

hyo2/soundspeed/base/geodesy.py

@@ -7,7 +7,7 @@
 from osgeo import osr
 from pyproj import Geod
 
-from hyo2.abc.lib.gdal_aux import GdalAux
+from hyo2.abc2.lib.gdal_aux import GdalAux
 
 logger = logging.getLogger(__name__)
 

hyo2/soundspeed/base/setup.py

@@ -2,7 +2,7 @@
 import os
 from typing import Optional
 
-from hyo2.abc.lib.helper import Helper
+from hyo2.abc2.lib.helper import Helper
 from hyo2.soundspeed.base.setup_db import SetupDb
 from hyo2.soundspeed.profile.dicts import Dicts
 from hyo2.soundspeed.client.clientlist import ClientList