- new nzshm-common

- updated serverless, serverless-wsgi and serverless-python-requirements - move to python3.10 - pin boto3 and botcore to workaround boto/boto3#3648
GNS-Science · Apr 18, 2023 · c6d0b16 · c6d0b16
1 parent 1f82c65
commit c6d0b16
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## [0.7.2] - 2023-04-18
+### Changed
+ - new nzshm-common
+ - updated serverless, serverless-wsgi and serverless-python-requirements
+ - move to python3.10
+ - pin boto3 and botcore to workaround https://github.com/boto/boto3/issues/3648
+### Added
+ - about resolver returns version
+
 ## [0.7.1] - 2023-04-17
 ### Changed
  - updated dependencies nzshm_common, geopandas, toshi_hazard_s

diff --git a/kororaa_graphql_api/schema/schema.py b/kororaa_graphql_api/schema/schema.py
@@ -3,6 +3,7 @@
 import logging
 
 import graphene
+import kororaa_graphql_api
 from graphene import relay
 from nzshm_common.location import CodedLocation
 
@@ -116,7 +117,7 @@ def resolve_hazard_curves(root, info, **kwargs):
         return hazard_curves(kwargs)
 
     def resolve_about(root, info, **args):
-        return "Hello World, I am kororaa_graphql_api!"
+        return f"Hello World, I am kororaa_graphql_api! Version: {kororaa_graphql_api.__version__}"
 
 
 schema_root = graphene.Schema(query=QueryRoot, mutation=None, auto_camelcase=False)
diff --git a/package.json b/package.json
@@ -18,9 +18,9 @@
   "homepage": "https://github.com/GNS-Science/kororaa-graphql-api#readme",
   "dependencies": {
     "ajv": "^8.11.0",
-    "serverless": "^3.18.2",
-    "serverless-python-requirements": "^5.4.0",
-    "serverless-wsgi": "^3.0.0"
+    "serverless": "^3.30.1",
+    "serverless-python-requirements": "^6.0.0",
+    "serverless-wsgi": "^3.0.2"
   },
   "devDependencies": {
     "serverless-plugin-warmup": "^8.0.0",

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -31,13 +31,14 @@ PyYAML = "^6.0"
 pandas = "^1.4.3"
 geopandas = "^0.12.0"
 matplotlib = "^3.5.3"
-boto3 = "^1.24.57"
+boto3 = "1.26.90"     # to align with AWS pyton 3.10 lambda
+botocore = "1.29.90"  # as above
 python-dateutil = "^2.8.2"
 pyproj = "3.3.0"
 nzshm-grid-loc = {git = "https://github.com/GNS-Science/nzshm-grid-loc.git", rev = "main"}
-nzshm-common = {extras = ["geometry"], version = "^0.5.0"}
 nzshm-model = "^0.2.0"
 toshi-hazard-store = "^0.7.0"
+nzshm-common = "^0.5.1"
 
 [tool.poetry.group.dev.dependencies]
 tox = "^4.2.8"

diff --git a/serverless.yml b/serverless.yml
@@ -38,6 +38,7 @@ custom:
     slimPatterns:
       - '**/*.egg-info*'
     noDeploy:
+      - boto3
       - botocore
       - fiona
       - Fiona.libs

diff --git a/tests/test_kororaa_graphql_api.py b/tests/test_kororaa_graphql_api.py
@@ -6,6 +6,7 @@
 from kororaa_graphql_api.schema import schema_root
 from kororaa_graphql_api.kororaa_graphql_api import create_app
 
+import kororaa_graphql_api
 
 class TestFlaskApp(unittest.TestCase):
     """Tests the basic app create."""
@@ -35,3 +36,16 @@ def test_get_about(self):
         executed = self.client.execute(QUERY)
         print(executed)
         self.assertTrue('Hello World' in executed['data']['about'])
+
+
+    def test_get_about_has_version(self):
+
+        QUERY = """
+        query {
+            about
+        }
+        """
+
+        executed = self.client.execute(QUERY)
+        print(executed)
+        self.assertTrue(kororaa_graphql_api.__version__ in executed['data']['about'])