From b89b8df5903f03177af35377d626f279a9d9fa7e Mon Sep 17 00:00:00 2001 From: bedroesb Date: Tue, 26 Oct 2021 11:38:14 +0200 Subject: [PATCH 1/4] fixing empty table --- ena_upload/_version.py | 2 +- ena_upload/ena_upload.py | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ena_upload/_version.py b/ena_upload/_version.py index df12433..f6b7e26 100644 --- a/ena_upload/_version.py +++ b/ena_upload/_version.py @@ -1 +1 @@ -__version__ = "0.4.2" +__version__ = "0.4.3" diff --git a/ena_upload/ena_upload.py b/ena_upload/ena_upload.py index 13f6a23..2c69d2d 100755 --- a/ena_upload/ena_upload.py +++ b/ena_upload/ena_upload.py @@ -18,7 +18,7 @@ from lxml import etree import pandas as pd import tempfile -from ena_upload._version import __version__ +__version__ = "test" # SettingWithCopyWarning causes false positive @@ -79,8 +79,8 @@ def extract_targets(action, schema_dataframe): for schema, dataframe in schema_dataframe.items(): filtered = dataframe.query(f'status=="{action}"') - # ? add a function to control empty filtered, return error - schema_targets[schema] = filtered + if filtered.empty != True: + schema_targets[schema] = filtered return schema_targets @@ -711,6 +711,9 @@ def main(): # these rows are the targets for submission schema_targets = extract_targets(action, schema_dataframe) + if not schema_targets: + sys.exit(f"There is no table submitted having at least one row with {action} as action in the status column.") + if action == 'ADD': # when adding run object # update schema_targets wit md5 hash From 9b8fdd3b9f2defb65d232d4c2f10538d3616c7c3 Mon Sep 17 00:00:00 2001 From: bedroesb Date: Tue, 26 Oct 2021 11:44:02 +0200 Subject: [PATCH 2/4] version fix --- ena_upload/ena_upload.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ena_upload/ena_upload.py b/ena_upload/ena_upload.py index 2c69d2d..57d6df8 100755 --- a/ena_upload/ena_upload.py +++ b/ena_upload/ena_upload.py @@ -18,7 +18,7 @@ from lxml import etree import pandas as pd import tempfile -__version__ = "test" +from _version import __version__ # SettingWithCopyWarning causes false positive From f4081e45e562754ebf529a48cb5630809d226fc9 Mon Sep 17 00:00:00 2001 From: bedroesb Date: Tue, 26 Oct 2021 11:45:43 +0200 Subject: [PATCH 3/4] version --- ena_upload/ena_upload.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ena_upload/ena_upload.py b/ena_upload/ena_upload.py index 57d6df8..54a73c5 100755 --- a/ena_upload/ena_upload.py +++ b/ena_upload/ena_upload.py @@ -18,7 +18,7 @@ from lxml import etree import pandas as pd import tempfile -from _version import __version__ +from ena_upload._version import __version__ # SettingWithCopyWarning causes false positive From 5af2584334a8db767ff394f352963b6113d2d605 Mon Sep 17 00:00:00 2001 From: bedroesb Date: Tue, 26 Oct 2021 13:32:42 +0200 Subject: [PATCH 4/4] not empty --- ena_upload/ena_upload.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ena_upload/ena_upload.py b/ena_upload/ena_upload.py index 54a73c5..6dbfc53 100755 --- a/ena_upload/ena_upload.py +++ b/ena_upload/ena_upload.py @@ -79,7 +79,7 @@ def extract_targets(action, schema_dataframe): for schema, dataframe in schema_dataframe.items(): filtered = dataframe.query(f'status=="{action}"') - if filtered.empty != True: + if not filtered.empty: schema_targets[schema] = filtered return schema_targets