Revert bumpversion patch, use dict.get to avoid KeyErrors

EddieLF · EddieLF · commit 5af034bcbca8 · 2024-04-03T09:20:11.000+11:00
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 6.8.1
+current_version = 6.8.0
 commit = True
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>[A-z0-9-]+)
diff --git a/api/server.py b/api/server.py
@@ -19,7 +19,7 @@
 from db.python.utils import get_logger
 
 # This tag is automatically updated by bump2version
-_VERSION = '6.8.1'
+_VERSION = '6.8.0'
 
 logger = get_logger()
 
diff --git a/db/python/layers/seqr.py b/db/python/layers/seqr.py
@@ -408,7 +408,7 @@ async def post_es_index_update(self, session: aiohttp.ClientSession, url: str, p
             headers=headers,
         )
         resp.raise_for_status()
-        return f'Updated ES index {post_json["elasticsearchIndex"]}: {resp.status} - {resp.reason}'
+        return f'Updated ES index {post_json.get("elasticsearchIndex")}: {resp.status} - {resp.reason}'
 
     async def update_es_index(
         self,
diff --git a/deploy/python/version.txt b/deploy/python/version.txt
@@ -1 +1 @@
-6.8.1
+6.8.0
diff --git a/setup.py b/setup.py
@@ -19,7 +19,7 @@
 setup(
     name=PKG,
     # This tag is automatically updated by bump2version
-    version='6.8.1',
+    version='6.8.0',
     description='Python API for interacting with the Sample API system',
     long_description=readme,
     long_description_content_type='text/markdown',
diff --git a/web/package.json b/web/package.json
@@ -1,6 +1,6 @@
 {
     "name": "metamist",
-    "version": "6.8.1",
+    "version": "6.8.0",
     "private": true,
     "dependencies": {
         "@apollo/client": "^3.7.3",

Original file line number	Diff line number	Diff line change
`@@ -408,7 +408,7 @@ async def post_es_index_update(self, session: aiohttp.ClientSession, url: str, p`
`408`	`408`	`headers=headers,`
`409`	`409`	`)`
`410`	`410`	`resp.raise_for_status()`
`411`		`- return f'Updated ES index {post_json["elasticsearchIndex"]}: {resp.status} - {resp.reason}'`
	`411`	`+ return f'Updated ES index {post_json.get("elasticsearchIndex")}: {resp.status} - {resp.reason}'`
`412`	`412`
`413`	`413`	`async def update_es_index(`
`414`	`414`	`self,`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "metamist",`
`3`		`- "version": "6.8.1",`
	`3`	`+ "version": "6.8.0",`
`4`	`4`	`"private": true,`
`5`	`5`	`"dependencies": {`
`6`	`6`	`"@apollo/client": "^3.7.3",`