updates to GitHub actions

.github/workflows/ssm_on_linux.yml

@@ -9,36 +9,36 @@ jobs:
  max-parallel: 5
 
  steps:
- - uses: actions/checkout@v3
- - name: Set up Python 3.9
- uses: actions/setup-python@v3
+ - uses: actions/checkout@v4
+ - name: Set up Python 3.11
+ uses: actions/setup-python@v4
  with:
- python-version: 3.9
+ python-version: 3.11
  - name: setup-conda
- uses: s-weigand/setup-conda@v1.1.1
+ uses: s-weigand/setup-conda@v1.2.1
  with:
  update-conda: true
- python-version: 3.9
+ python-version: 3.11
  - name: Install dependencies
  run: |
  conda config --add channels conda-forge
- conda install appdirs bidict cartopy gdal matplotlib-base numpy psutil pyproj
+ conda install appdirs cartopy gdal matplotlib-base numpy psutil pyproj qt-material
  conda install gsw netCDF4 pillow pyserial scipy
  pip install PySide6
- pip install https://github.com/hydroffice/hyo2_abc/archive/master.zip
+ pip install hyo2.abc2
  pip install --no-deps .
  - name: Lint with flake8
  run: |
  conda install flake8
  # stop the build if there are Python syntax errors or undefined names
- flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+ flake8 ./hyo2/ssm2 --count --select=E9,F63,F7,F82 --show-source --statistics
  # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
- flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+ flake8 ./hyo2/ssm2 --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
  continue-on-error: true
  - name: Test with pytest
  run: |
  pip install coveralls PyYAML pytest pytest-cov
  py.test --cov
  coverage report -m
  coveralls
- continue-on-error: true
+ continue-on-error: false

.github/workflows/ssm_on_windows.yml

@@ -9,36 +9,36 @@ jobs:
  max-parallel: 5
 
  steps:
- - uses: actions/checkout@v3
- - name: Set up Python 3.9
- uses: actions/setup-python@v3
+ - uses: actions/checkout@v4
+ - name: Set up Python 3.11
+ uses: actions/setup-python@v4
  with:
- python-version: 3.9
+ python-version: 3.11
  - name: setup-conda
- uses: s-weigand/setup-conda@v1.1.1
+ uses: s-weigand/setup-conda@v1.2.1
  with:
  update-conda: true
- python-version: 3.9
+ python-version: 3.11
  - name: Install dependencies
  run: |
  conda config --add channels conda-forge
- conda install appdirs bidict cartopy gdal matplotlib-base numpy psutil pyproj
+ conda install appdirs cartopy gdal matplotlib-base numpy psutil pyproj qt-material
  conda install gsw netCDF4 pillow pyserial scipy
  pip install PySide6
- pip install https://github.com/hydroffice/hyo2_abc/archive/master.zip
+ pip install hyo2.abc2
  pip install --no-deps .
  - name: Lint with flake8
  run: |
  conda install flake8
  # stop the build if there are Python syntax errors or undefined names
- flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+ flake8 .\hyo2\ssm2 --count --select=E9,F63,F7,F82 --show-source --statistics
  # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
- flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+ flake8 .\hyo2\ssm2 --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
  continue-on-error: true
  - name: Test with pytest
  run: |
  pip install coveralls PyYAML pytest pytest-cov
  py.test --cov
  coverage report -m
  coveralls
- continue-on-error: true
+ continue-on-error: false

.travis.yml

@@ -30,7 +30,7 @@ install:
 
  - pip install coveralls PyYAML pytest pytest-cov wheel
  # for hyo2.abc2
- - conda install appdirs bidict cartopy gdal matplotlib-base numpy psutil pyproj
+ - conda install appdirs cartopy gdal matplotlib-base numpy psutil pyproj
  - pip install PySide6
  - pip install https://github.com/hydroffice/hyo2_abc/archive/master.zip
  # for hyo2.soundspeed

MANIFEST.in

@@ -1,2 +1,8 @@
 # Include the license file
-include LICENSE
+include LICENSE
+include AUTHORS.rst
+include HISTORY.rst
+recursive-include examples *.py
+recursive-include tests *.py
+recursive-include docs *.*
+prune docs/_build

README.rst

@@ -1,51 +1,50 @@
-HydrOffice Sound Speed
-======================
+HydrOffice Sound Speed Manager
+==============================
 
-..
- .. image:: https://img.shields.io/pypi/v/hyo2.ssm2.lib.svg
- :target: https://pypi.python.org/pypi/hyo2.soundspeed
- :alt: PyPi version
+.. image:: https://github.com/hydroffice/hyo2_soundspeed/raw/master/hyo2/ssm2/app/gui/soundspeedmanager/media/app_icon.png
+ :alt: logo
+
+|
+
+.. image:: https://img.shields.io/pypi/v/hyo2.ssm2.lib.svg
+ :target: https://pypi.python.org/pypi/hyo2.soundspeed
+ :alt: PyPi version
 
 .. image:: https://img.shields.io/badge/docs-latest-brightgreen.svg
  :target: https://www.hydroffice.org/manuals/ssm2/index.html
  :alt: Latest Documentation
 
-.. image:: https://ci.appveyor.com/api/projects/status/6krhsxkcqo0jrvu6?svg=true
- :target: https://ci.appveyor.com/project/giumas/hyo-soundspeed
- :alt: AppVeyor Status
+.. image:: https://github.com/hydroffice/hyo2_soundspeed/actions/workflows/ssm_on_windows.yml/badge.svg?branch=master
+ :target: https://github.com/hydroffice/hyo2_soundspeed/actions/workflows/ssm_on_windows.yml
+ :alt: Windows
 
 .. image:: https://github.com/hydroffice/hyo2_soundspeed/actions/workflows/ssm_on_linux.yml/badge.svg?branch=master
  :target: https://github.com/hydroffice/hyo2_soundspeed/actions/workflows/ssm_on_linux.yml
- :alt: GitHub Linux Status
-
-.. image:: https://github.com/hydroffice/hyo2_soundspeed/actions/workflows/ssm_on_macos.yml/badge.svg?branch=master
- :target: https://github.com/hydroffice/hyo2_soundspeed/actions/workflows/ssm_on_macos.yml
- :alt: GitHub MacOS Status
-
-.. image:: https://github.com/hydroffice/hyo2_soundspeed/actions/workflows/ssm_on_windows.yml/badge.svg?branch=master
- :target: https://github.com/hydroffice/hyo2_soundspeed/actions/workflows/ssm_on_windows.yml
- :alt: GitHub Windows Status
+ :alt: Linux
 
 .. image:: https://app.codacy.com/project/badge/Grade/c1eccd9e15a7408fb05aab06034e005e
  :target: https://www.codacy.com/gh/hydroffice/hyo2_soundspeed/dashboard?utm_source=github.com&utm_medium=referral&utm_content=hydroffice/hyo2_soundspeed&utm_campaign=Badge_Grade
- :alt: Codacy badge
+ :alt: codacy
+
+.. image:: https://coveralls.io/repos/github/hydroffice/hyo2_soundspeed/badge.svg?branch=master
+ :target: https://coveralls.io/github/hydroffice/hyo2_soundspeed?branch=master
+ :alt: coverall
 
 .. image:: https://zenodo.org/badge/54854024.svg
  :target: https://zenodo.org/badge/latestdoi/54854024
  :alt: Zenodo DOI
 
+|
+
 * Code: `GitHub repo <https://github.com/hydroffice/hyo2_soundspeed>`_
-* Project page: `url <https://www.hydroffice.org/soundspeed/>`_
-* Download page: `url <https://bitbucket.org/hydroffice/hyo_sound_speed_manager/downloads/>`_
+* Project page: `url <https://www.hydroffice.org/soundspeed/>`_, `download <https://bitbucket.org/hydroffice/hyo_sound_speed_manager/downloads/>`_
 * License: LGPLv2.1 or IA license (See `Dual license <https://www.hydroffice.org/license_lgpl21/>`_)
 
+|
 
 General Info
 ------------
 
-.. image:: https://www.hydroffice.org/static/app_soundspeed/img/logo.png
- :alt: logo ssm
-
 The HydrOffice's Sound Speed package provides a library and tools to manage sound speed profiles.
 The package is part of HydrOffice, a research development framework for ocean mapping. HydrOffice aims to provide
 a collection of hydro-packages to deal with specific issues in the field, speeding up both algorithms testing and

appveyor.yml

@@ -46,7 +46,7 @@ install:
 
  - pip install coveralls PyYAML pytest pytest-cov wheel
  # for hyo2.abc2
- - conda install appdirs bidict cartopy "gdal<3.0.0" matplotlib-base numpy psutil pyproj
+ - conda install appdirs cartopy "gdal<3.0.0" matplotlib-base numpy psutil pyproj
  - pip install PySide6
  # for hyo2.soundspeed
  - conda install gsw netCDF4 pillow pyserial scipy

setup.py

@@ -58,7 +58,7 @@ def find_version(*file_paths):
  install_requires=[
  "appdirs",
  "gsw",
- "hyo2.abc2>=2.3.1",
+ "hyo2.abc2>=2.3.5",
  "matplotlib",
  "netCDF4",
  "numpy",