From 5af034bcbca872f45c71f92d32b0f75d98911871 Mon Sep 17 00:00:00 2001 From: EddieLF Date: Wed, 3 Apr 2024 09:20:11 +1100 Subject: [PATCH] Revert bumpversion patch, use dict.get to avoid KeyErrors --- .bumpversion.cfg | 2 +- api/server.py | 2 +- db/python/layers/seqr.py | 2 +- deploy/python/version.txt | 2 +- setup.py | 2 +- web/package.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 973f8fed1..26fed7085 100644 --- 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\d+)\.(?P\d+)\.(?P[A-z0-9-]+) diff --git a/api/server.py b/api/server.py index 1cc38e794..b5d58209b 100644 --- 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 index bdec90233..595c81302 100644 --- 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 index 5f6c0863a..e029aa99b 100644 --- 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 index d8fb05e61..7e6ad5d47 100644 --- 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 index 2e78b5bf3..1c1527f30 100644 --- 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",