HARMONY-1781 - Update to harmony-service-lib-py==2.0.0.

CHANGELOG.md

@@ -4,6 +4,14 @@ The Harmony Regridding Service follows semantic versioning. All notable changes
 to this project will be documented in this file. The format is based on [Keep a
 Changelog](http://keepachangelog.com/en/1.0.0/).
 
+## [v1.0.4] - 2024-09-30
+
+## Changed
+This version of the Harmony Regridding Service updates most dependency versions,
+most notably updating to `harmony-service-lib-py==2.0.0`. This is a breaking
+change in the package, requiring the renaming of imports in the Harmony
+Regridding Service.
+
 ## [v1.0.3] - 2024-09-26
 
 ## Changed
@@ -42,6 +50,8 @@ include updated documentation and files outlined by the
 For more information on internal releases prior to NASA open-source approval,
 see legacy-CHANGELOG.md.
 
+[v1.0.4]: https://github.com/nasa/harmony-regridding-service/releases/tag/1.0.4
+[v1.0.3]: https://github.com/nasa/harmony-regridding-service/releases/tag/1.0.3
 [v1.0.2]: https://github.com/nasa/harmony-regridding-service/releases/tag/1.0.2
 [v1.0.1]: https://github.com/nasa/harmony-regridding-service/releases/tag/1.0.1
 [v1.0.0]: https://github.com/nasa/harmony-regridding-service/releases/tag/1.0.0

docker/service_version.txt

@@ -1 +1 @@
-1.0.3
+1.0.4

harmony_regridding_service/__main__.py

@@ -4,7 +4,7 @@
 from sys import argv
 from typing import List
 
-from harmony import is_harmony_cli, run_cli, setup_cli
+from harmony_service_lib import is_harmony_cli, run_cli, setup_cli
 
 from harmony_regridding_service.adapter import RegriddingServiceAdapter
 

harmony_regridding_service/adapter.py

@@ -11,10 +11,15 @@
 from tempfile import mkdtemp
 from typing import Optional
 
-from harmony import BaseHarmonyAdapter
-from harmony.message import Source as HarmonySource
-from harmony.message_utility import has_self_consistent_grid
-from harmony.util import bbox_to_geometry, download, generate_output_filename, stage
+from harmony_service_lib import BaseHarmonyAdapter
+from harmony_service_lib.message import Source as HarmonySource
+from harmony_service_lib.message_utility import has_self_consistent_grid
+from harmony_service_lib.util import (
+    bbox_to_geometry,
+    download,
+    generate_output_filename,
+    stage,
+)
 from pystac import Asset, Catalog, Item
 
 from harmony_regridding_service.exceptions import (

harmony_regridding_service/exceptions.py

@@ -4,7 +4,7 @@
 
 """
 
-from harmony.util import HarmonyException
+from harmony_service_lib.util import HarmonyException
 
 
 class RegridderException(HarmonyException):

harmony_regridding_service/regridding_service.py

@@ -19,9 +19,9 @@
 from typing import TYPE_CHECKING, Dict, Iterable, List, Set, Tuple
 
 import numpy as np
-from harmony.message import Message, Source
-from harmony.message_utility import has_dimensions
-from harmony.util import generate_output_filename
+from harmony_service_lib.message import Message, Source
+from harmony_service_lib.message_utility import has_dimensions
+from harmony_service_lib.util import generate_output_filename
 from netCDF4 import Dataset, Dimension, Group, Variable
 from pyresample.ewa import DaskEWAResampler
 from pyresample.geometry import AreaDefinition, SwathDefinition

harmony_regridding_service/utilities.py

@@ -7,8 +7,8 @@
 from os.path import splitext
 from typing import Optional
 
-from harmony.message import Message
-from harmony.message_utility import rgetattr
+from harmony_service_lib.message import Message
+from harmony_service_lib.message_utility import rgetattr
 from pyproj import CRS
 from pyproj.exceptions import CRSError
 

pip_requirements.txt

@@ -1,8 +1,8 @@
 # Open source packages available from PyPI
+dask ~= 2024.9.1
 earthdata-varinfo ~= 3.0.0
-harmony-service-lib ~= 1.1.0
+harmony-service-lib ~= 2.0.0
+netCDF4 ~= 1.6.5
 numpy ~= 1.24.2
-netCDF4 ~= 1.6.3
-pyproj ~= 3.4.1
-pyresample ~= 1.26.1
-dask ~= 2023.3.0
+pyproj ~= 3.6.1
+pyresample ~= 1.30.0

tests/pip_test_requirements.txt

@@ -1,5 +1,5 @@
-coverage~=7.2.2
-pre-commit~=3.7.0
-pycodestyle~=2.10.0
-pylint~=2.17.2
+coverage~=7.6.1
+pre-commit~=3.8.0
+pycodestyle~=2.12.1
+pylint~=3.3.1
 unittest-xml-reporting~=3.2.0

tests/test_adapter.py

@@ -7,8 +7,8 @@
 from unittest import TestCase
 from unittest.mock import ANY, patch
 
-from harmony.message import Message
-from harmony.util import config
+from harmony_service_lib.message import Message
+from harmony_service_lib.util import config
 from pystac import Catalog
 
 from harmony_regridding_service.adapter import RegriddingServiceAdapter

tests/unit/test_adapter.py

@@ -1,7 +1,7 @@
 from unittest import TestCase
 
-from harmony.message import Message
-from harmony.util import HarmonyException, config
+from harmony_service_lib.message import Message
+from harmony_service_lib.util import HarmonyException, config
 
 from harmony_regridding_service.adapter import RegriddingServiceAdapter
 from harmony_regridding_service.exceptions import (

tests/unit/test_regridding_service.py

@@ -8,7 +8,7 @@
 from uuid import uuid4
 
 import numpy as np
-from harmony.message import Message
+from harmony_service_lib.message import Message
 from netCDF4 import Dataset, Variable
 from numpy.testing import assert_array_equal
 from pyresample.geometry import AreaDefinition

tests/unit/test_utilities.py

@@ -1,6 +1,6 @@
 from unittest import TestCase
 
-from harmony.message import Message
+from harmony_service_lib.message import Message
 
 from harmony_regridding_service.exceptions import InvalidTargetCRS
 from harmony_regridding_service.utilities import (

tests/utilities.py

@@ -3,7 +3,7 @@
 from collections import namedtuple
 from datetime import datetime
 
-from harmony.util import bbox_to_geometry
+from harmony_service_lib.util import bbox_to_geometry
 from pystac import Asset, Catalog, Item
 
 Granule = namedtuple('Granule', ['url', 'media_type', 'roles'])