Merge pull request #66 from GNS-Science/update-common

Update nzshm-common dependency
GNS-Science · Nov 20, 2024 · fa34800 · fa34800
2 parents 77efd33 + 2b734bd
commit fa34800
Show file tree

Hide file tree

Showing 24 changed files with 44 additions and 32 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.7.9
+current_version = 0.7.10
 commit = True
 tag = True
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [0.7.10] - 2024-11-20
+
+### Changed
+ - updated nzshm-common dependency
+
 ## [0.7.9] - 2024-02-26
 
 ### Changed

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,7 +1,7 @@
 [tool]
 [tool.poetry]
 name = "toshi-hazard-store"
-version = "0.7.9"
+version = "0.7.10"
 homepage = "https://github.com/GNS-Science/toshi-hazard-store"
 description = "Library for saving and retrieving NZHSM openquake hazard results with convenience (uses AWS Dynamodb)."
 authors = ["GNS Science <[email protected]>"]
@@ -38,12 +38,12 @@ python = ">=3.10,<3.13"
 # urllib3 = ">2" 
 pandas = "~2.0.3"
 numpy = "^1.26.4"
-nzshm-common = "^0.6.1"
 pynamodb-attributes = "^0.4.0"
 pynamodb = "^5.5.1"
 openquake-engine = {version = "^3.18.0", optional = true}
 fiona = {version = "^1.9.5", optional = true}
 networkx = {version = "^3.2.1", optional = true}
+nzshm-common = {git = "https://github.com/GNS-Science/nzshm-common-py.git", rev = "pre-release"}
 
 [tool.poetry.group.dev.dependencies]
 black  = { version = "^22.3"}

diff --git a/scripts/nz_binned_demo.py b/scripts/nz_binned_demo.py
@@ -2,7 +2,7 @@
 from typing import Dict, List, Tuple
 
 from nzshm_common.grids.region_grid import load_grid
-from nzshm_common.location.code_location import CodedLocation
+from nzshm_common.location import CodedLocation
 from nzshm_common.location.location import LOCATIONS_BY_ID
 
 

diff --git a/scripts/ths_cache.py b/scripts/ths_cache.py
@@ -9,8 +9,8 @@
 import click
 import pandas as pd
 from nzshm_common.grids import RegionGrid, load_grid
-from nzshm_common.location.code_location import CodedLocation
-from nzshm_common.location.location import LOCATION_LISTS, LOCATIONS, location_by_id
+from nzshm_common.location import CodedLocation, location_by_id
+from nzshm_common.location.location import LOCATION_LISTS, LOCATIONS
 
 from toshi_hazard_store import model, query
 from toshi_hazard_store.config import DEPLOYMENT_STAGE, LOCAL_CACHE_FOLDER, REGION

diff --git a/scripts/ths_testing.py b/scripts/ths_testing.py
@@ -5,8 +5,8 @@
 
 import click
 import pandas as pd
-from nzshm_common.location.code_location import CodedLocation
-from nzshm_common.location.location import LOCATIONS, location_by_id
+from nzshm_common.location import CodedLocation, location_by_id
+from nzshm_common.location.location import LOCATIONS
 
 from toshi_hazard_store import model, query, query_v3
 from toshi_hazard_store.config import DEPLOYMENT_STAGE, LOCAL_CACHE_FOLDER, REGION

diff --git a/tests/test_pynamo_disagg_models.py b/tests/test_pynamo_disagg_models.py
@@ -6,7 +6,7 @@
 
 import numpy as np
 from moto import mock_dynamodb
-from nzshm_common.location.code_location import CodedLocation
+from nzshm_common.location import CodedLocation
 
 from toshi_hazard_store import model
 

diff --git a/tests/test_pynamo_models_v3.py b/tests/test_pynamo_models_v3.py
@@ -3,7 +3,7 @@
 
 import pynamodb.exceptions
 from moto import mock_dynamodb
-from nzshm_common.location.code_location import CodedLocation
+from nzshm_common.location import CodedLocation
 
 from toshi_hazard_store import model
 

diff --git a/tests/test_query_disaggs.py b/tests/test_query_disaggs.py
@@ -3,7 +3,7 @@
 
 import numpy as np
 from moto import mock_dynamodb
-from nzshm_common.location.code_location import CodedLocation
+from nzshm_common.location import CodedLocation
 from nzshm_common.location.location import LOCATIONS_BY_ID
 
 from toshi_hazard_store import model, query

diff --git a/tests/test_query_hazard_agg_v3.py b/tests/test_query_hazard_agg_v3.py
@@ -3,7 +3,7 @@
 from unittest.mock import patch
 
 from moto import mock_dynamodb
-from nzshm_common.location.code_location import CodedLocation
+from nzshm_common.location import CodedLocation
 from nzshm_common.location.location import LOCATIONS_BY_ID
 
 from toshi_hazard_store import model, query_v3

diff --git a/tests/test_query_hazard_agg_vs30_fix.py b/tests/test_query_hazard_agg_vs30_fix.py
@@ -3,7 +3,7 @@
 from unittest.mock import patch
 
 from moto import mock_dynamodb
-from nzshm_common.location.code_location import CodedLocation
+from nzshm_common.location import CodedLocation
 from nzshm_common.location.location import LOCATIONS_BY_ID
 
 from toshi_hazard_store import model, query_v3

diff --git a/tests/test_query_hazard_caching.py b/tests/test_query_hazard_caching.py
@@ -6,7 +6,7 @@
 from unittest.mock import patch
 
 from moto import mock_dynamodb
-from nzshm_common.location.code_location import CodedLocation
+from nzshm_common.location import CodedLocation
 from nzshm_common.location.location import LOCATIONS_BY_ID
 
 from toshi_hazard_store import model, query

diff --git a/tests/test_query_rlzs_v3.py b/tests/test_query_rlzs_v3.py
@@ -2,7 +2,7 @@
 import unittest
 
 from moto import mock_dynamodb
-from nzshm_common.location.code_location import CodedLocation
+from nzshm_common.location import CodedLocation
 from nzshm_common.location.location import LOCATIONS_BY_ID
 
 from toshi_hazard_store import model, query_v3

diff --git a/tests/test_query_rlzs_vs30_fix.py b/tests/test_query_rlzs_vs30_fix.py
@@ -2,7 +2,7 @@
 import unittest
 
 from moto import mock_dynamodb
-from nzshm_common.location.code_location import CodedLocation
+from nzshm_common.location import CodedLocation
 from nzshm_common.location.location import LOCATIONS_BY_ID
 
 from toshi_hazard_store import model, query_v3

diff --git a/tests/test_site_specific_vs30.py b/tests/test_site_specific_vs30.py
@@ -3,7 +3,7 @@
 import unittest
 
 from moto import mock_dynamodb
-from nzshm_common.location.code_location import CodedLocation
+from nzshm_common.location import CodedLocation
 
 from toshi_hazard_store import model
 

diff --git a/tests/test_utils.py b/tests/test_utils.py
@@ -3,7 +3,7 @@
 import unittest
 
 from nzshm_common.grids.region_grid import load_grid
-from nzshm_common.location.code_location import CodedLocation
+from nzshm_common.location import CodedLocation
 
 
 class TestCodedLocation(unittest.TestCase):

diff --git a/toshi_hazard_store/__init__.py b/toshi_hazard_store/__init__.py
@@ -2,7 +2,7 @@
 
 __author__ = """GNS Science"""
 __email__ = '[email protected]'
-__version__ = '0.7.9'
+__version__ = '0.7.10'
 
 import toshi_hazard_store.model as model
 import toshi_hazard_store.query.hazard_query as query_v3  # alias for clients using deprecated module name
diff --git a/toshi_hazard_store/model/disagg_models.py b/toshi_hazard_store/model/disagg_models.py
@@ -4,7 +4,7 @@
 from datetime import datetime, timezone
 
 import numpy as np
-from nzshm_common.location.code_location import CodedLocation
+from nzshm_common.location import CodedLocation
 from pynamodb.attributes import UnicodeAttribute
 from pynamodb_attributes import FloatAttribute
 

diff --git a/toshi_hazard_store/model/location_indexed_model.py b/toshi_hazard_store/model/location_indexed_model.py
@@ -1,7 +1,7 @@
 import uuid
 from datetime import datetime, timezone
 
-from nzshm_common.location.code_location import CodedLocation
+from nzshm_common.location import CodedLocation
 from pynamodb.attributes import UnicodeAttribute, VersionAttribute
 from pynamodb.models import Model
 from pynamodb_attributes import FloatAttribute, TimestampAttribute

diff --git a/toshi_hazard_store/model/openquake_models.py b/toshi_hazard_store/model/openquake_models.py
@@ -3,7 +3,7 @@
 import logging
 from typing import Iterable, Iterator, Sequence, Union
 
-from nzshm_common.location.code_location import CodedLocation
+from nzshm_common.location import CodedLocation
 from pynamodb.attributes import JSONAttribute, ListAttribute, NumberAttribute, UnicodeAttribute, UnicodeSetAttribute
 from pynamodb.indexes import AllProjection, LocalSecondaryIndex
 from pynamodb.models import Model

diff --git a/toshi_hazard_store/query/disagg_queries.py b/toshi_hazard_store/query/disagg_queries.py
@@ -5,7 +5,7 @@
 import logging
 from typing import Iterable, Iterator, List, Type, Union
 
-from nzshm_common.location.code_location import CodedLocation
+from nzshm_common.location import CodedLocation
 from pynamodb.expressions.condition import Condition
 
 from toshi_hazard_store.model import (

diff --git a/toshi_hazard_store/query/hazard_query.py b/toshi_hazard_store/query/hazard_query.py
@@ -4,7 +4,7 @@
 import logging
 from typing import Iterable, Iterator, Union
 
-from nzshm_common.location.code_location import CodedLocation
+from nzshm_common.location import CodedLocation
 
 import toshi_hazard_store.model as model
 

diff --git a/toshi_hazard_store/utils.py b/toshi_hazard_store/utils.py
@@ -1,6 +1,6 @@
 """Common utilities."""
 
-from nzshm_common.location.code_location import CodedLocation
+from nzshm_common.location import CodedLocation
 
 
 def normalise_site_code(oq_site_object: tuple, force_normalized: bool = False) -> CodedLocation: