eva-sub-cli 0.6.2__tar.gz → 0.6.3__tar.gz

{eva_sub_cli-0.6.2 → eva_sub_cli-0.6.3}/.github/workflows/integration-tests.yml

@@ -6,6 +6,9 @@ on:
   pull_request:
     branches: [ main]
 
+permissions:
+  contents: read
+
 env:
   VCF_VALIDATOR_VERSION: "0.10.2"
   NXF_VER: "23.10.0"

{eva_sub_cli-0.6.2 → eva_sub_cli-0.6.3}/.github/workflows/publish.yml

@@ -5,12 +5,15 @@ on:
     tags:
       - '**'
 
+permissions:
+  contents: read
+
 jobs:
   test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.9"]
+        python-version: ["3.11"]
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
@@ -38,7 +41,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v5
       with:
-        python-version: '3.9'
+        python-version: '3.11'
         cache: pip
         cache-dependency-path: '**/pyproject.toml'
     - name: Install dependencies

{eva_sub_cli-0.6.2 → eva_sub_cli-0.6.3}/.github/workflows/tests.yml

@@ -4,14 +4,17 @@ on:
   push:
     branches: [ main ]
   pull_request:
-    branches: [ main, add-validation-tasks ]
+    branches: [ main ]
+
+permissions:
+  contents: read
 
 jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.9", "3.11", "3.12"]
+        python-version: ["3.11", "3.12"]
 
     steps:
     - uses: actions/checkout@v2

{eva_sub_cli-0.6.2 → eva_sub_cli-0.6.3}/.github/workflows/trigger-eva-sub-cli-integration-tests.yml

@@ -4,6 +4,9 @@ on:
   push:
     branches: [main]
 
+permissions:
+  contents: read
+
 jobs:
   trigger-integration-tests:
     runs-on: ubuntu-latest

{eva_sub_cli-0.6.2 → eva_sub_cli-0.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eva_sub_cli
-Version: 0.6.2
+Version: 0.6.3
 Summary: EBI EVA - validation and submission command line tool
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
@@ -19,7 +19,7 @@ Classifier: License :: OSI Approved :: Apache Software License
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: ebi_eva_common_pyutils==0.*,>=0.7.4
+Requires-Dist: ebi_eva_common_pyutils>=0.7.4
 Requires-Dist: jinja2==3.*,>=3.0.0
 Requires-Dist: jsonschema==4.*
 Requires-Dist: openpyxl==3.*

eva_sub_cli-0.6.3/eva_sub_cli/_version.py

@@ -0,0 +1,24 @@
+# file generated by vcs-versioning
+# don't change, don't track in version control
+from __future__ import annotations
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+version: str
+__version__: str
+__version_tuple__: tuple[int | str, ...]
+version_tuple: tuple[int | str, ...]
+commit_id: str | None
+__commit_id__: str | None
+
+__version__ = version = '0.6.3'
+__version_tuple__ = version_tuple = (0, 6, 3)
+
+__commit_id__ = commit_id = 'g1c826d931'

eva_sub_cli-0.6.3/eva_sub_cli/exceptions.py

@@ -0,0 +1,40 @@
+class NoVcfsFoundException(Exception):
+    def __init__(self, message):
+        self.message = message
+        super().__init__(self.message)
+
+
+class InvalidFileTypeError(Exception):
+    def __init__(self, message):
+        self.message = message
+        super().__init__(self.message)
+
+
+class MetadataTemplateVersionException(Exception):
+    def __init__(self, message):
+        self.message = message
+        super().__init__(self.message)
+
+
+class MetadataTemplateVersionNotFoundException(Exception):
+    def __init__(self, message):
+        self.message = message
+        super().__init__(self.message)
+
+
+class SubmissionNotFoundException(Exception):
+    def __init__(self, message):
+        self.message = message
+        super().__init__(self.message)
+
+
+class SubmissionStatusException(Exception):
+    def __init__(self, message):
+        self.message = message
+        super().__init__(self.message)
+
+
+class SubmissionUploadException(Exception):
+    def __init__(self, message):
+        self.message = message
+        super().__init__(self.message)

{eva_sub_cli-0.6.2 → eva_sub_cli-0.6.3}/eva_sub_cli/executables/cli.py

@@ -2,8 +2,6 @@ import sys
 
 from requests import HTTPError
 
-from eva_sub_cli.exceptions.submission_upload_exception import SubmissionUploadException
-
 if not sys.warnoptions:
     import warnings
     warnings.simplefilter("ignore")
@@ -15,10 +13,8 @@ from ebi_eva_common_pyutils.logger import logging_config
 
 import eva_sub_cli
 from eva_sub_cli import orchestrator
-from eva_sub_cli.exceptions.metadata_template_version_exception import MetadataTemplateVersionException, \
-    MetadataTemplateVersionNotFoundException
-from eva_sub_cli.exceptions.submission_status_exception import SubmissionStatusException
-from eva_sub_cli.exceptions.submission_not_found_exception import SubmissionNotFoundException
+from eva_sub_cli.exceptions import MetadataTemplateVersionException, MetadataTemplateVersionNotFoundException, \
+    SubmissionStatusException, SubmissionNotFoundException, SubmissionUploadException, NoVcfsFoundException
 from eva_sub_cli.call_home import CallHomeClient
 from eva_sub_cli.file_utils import is_submission_dir_writable, DirLockError, DirLock
 from eva_sub_cli.orchestrator import VALIDATE, SUBMIT, DOCKER, NATIVE
@@ -130,48 +126,50 @@ def main():
             # Pass on all the arguments to the orchestrator
             orchestrator.orchestrate_process(call_home=call_home, **args.__dict__)
     except DirLockError as dle:
-        print(f'Could not acquire the lock file for {args.submission_dir} because another process is using this '
-              f'directory or a previous process did not terminate correctly. '
-              f'If the problem persists, remove the lock file manually.')
+        logger.exception(f'Could not acquire the lock file for {args.submission_dir} because another process is using '
+                         f'this directory or a previous process did not terminate correctly. '
+                         f'If the problem persists, remove the lock file manually.')
         caught_exception = dle
         exit_status = 65
     except FileNotFoundError as fne:
-        print(fne)
+        logger.exception(fne)
         caught_exception = fne
         exit_status = 66
+    except NoVcfsFoundException as nvfe:
+        logger.exception(f'{nvfe}. Please ensure that you have listed VCF files in the metadata (.vcf or .vcf.gz file '
+                         f'extension), and that you have not modified the metadata template in any way.')
+        caught_exception = nvfe
+        exit_status = 67
     except SubmissionNotFoundException as snfe:
-        print(f'{snfe}. Please contact EVA Helpdesk')
+        logger.exception(f'{snfe}. Please contact EVA Helpdesk')
         caught_exception = snfe
-        exit_status = 67
+        exit_status = 68
     except SubmissionStatusException as sse:
-        print(f'{sse}. Please try again later. If the problem persists, please contact EVA Helpdesk')
+        logger.exception(f'{sse}. Please try again later. If the problem persists, please contact EVA Helpdesk')
         caught_exception = sse
-        exit_status = 68
+        exit_status = 69
     except MetadataTemplateVersionException as mte:
-        print(mte)
+        logger.exception(mte)
         caught_exception = mte
-        exit_status = 69
+        exit_status = 70
     except MetadataTemplateVersionNotFoundException as mte:
-        print(mte)
+        logger.exception(mte)
         caught_exception = mte
-        exit_status = 70
+        exit_status = 71
     except SubmissionUploadException as sue:
-        print(sue)
+        logger.exception(sue)
         caught_exception = sue
-        exit_status = 71
+        exit_status = 72
     except HTTPError as http_err:
-        print(http_err)
+        logger.exception(http_err)
         if http_err.response is not None and http_err.response.text:
             print(http_err.response.text)
         caught_exception = http_err
-        exit_status = 72
+        exit_status = 73
     except Exception as ex:
-        print(ex)
+        logger.exception(ex)
         caught_exception = ex
-        exit_status = 73
-
-    if caught_exception:
-        logger.exception(caught_exception)
+        exit_status = 74
 
     if call_home is not None:
         if exit_status == 0:

{eva_sub_cli-0.6.2 → eva_sub_cli-0.6.3}/eva_sub_cli/executables/xlsx2json.py

@@ -9,8 +9,6 @@ from ebi_eva_common_pyutils.logger import logging_config
 from openpyxl.reader.excel import load_workbook
 from openpyxl.workbook import Workbook
 
-from eva_sub_cli.orchestrator import get_sub_cli_version, get_sub_cli_github_tags
-
 WORKSHEETS_KEY_NAME = 'worksheets'
 REQUIRED_HEADERS_KEY_NAME = 'required'
 OPTIONAL_HEADERS_KEY_NAME = 'optional'
@@ -259,8 +257,7 @@ class XlsxParser:
         # If the file could not be loaded at all, return without generating JSON.
         if not self.file_loaded:
             return
-        # Include which version of the EVA schema we are using
-        json_data = {'$schema': self.get_json_schema_link()}
+        json_data = {}
         for title in self.xlsx_conf[WORKSHEETS_KEY_NAME]:
             self.active_worksheet = title
             if title == PROJECT:
@@ -281,13 +278,6 @@ class XlsxParser:
         with open(output_json_file, 'w') as open_file:
             json.dump(json_data, open_file, cls=DateTimeEncoder)
 
-    def get_json_schema_link(self):
-        sub_cli_version = get_sub_cli_version()
-        sub_cli_tags = get_sub_cli_github_tags()
-        if sub_cli_version in sub_cli_tags:
-            return f'https://raw.githubusercontent.com/EBIvariation/eva-sub-cli/refs/tags/v{sub_cli_version}/eva_sub_cli/etc/eva_schema.json'
-        else:
-            return 'https://raw.githubusercontent.com/EBIvariation/eva-sub-cli/main/eva_sub_cli/etc/eva_schema.json'
 
     def translate_header(self, title, header):
         if header in self.xlsx_conf[title].get(REQUIRED_HEADERS_KEY_NAME, {}):

{eva_sub_cli-0.6.2 → eva_sub_cli-0.6.3}/eva_sub_cli/nextflow/validation.nf

@@ -67,7 +67,6 @@ schema_dir = file(projectDir).parent + '/etc'
 conversion_configuration = "${schema_dir}/$params.conversion_configuration_name"
 
 
-
 def joinBasePath(path) {
     if (path) {
         return params.base_dir + '/' + path

{eva_sub_cli-0.6.2 → eva_sub_cli-0.6.3}/eva_sub_cli/orchestrator.py

@@ -9,23 +9,18 @@ from ebi_eva_common_pyutils.config import WritableConfig
 from ebi_eva_common_pyutils.logger import logging_config
 from openpyxl.reader.excel import load_workbook
 from packaging import version
-from requests import HTTPError
-from retry import retry
 
-import eva_sub_cli
 from eva_sub_cli import MINIMUM_METADATA_XLSX_TEMPLATE_VERSION
 from eva_sub_cli import SUB_CLI_CONFIG_FILE, __version__
-from eva_sub_cli.exceptions.invalid_file_type_exception import InvalidFileTypeError
-from eva_sub_cli.exceptions.metadata_template_version_exception import MetadataTemplateVersionException, \
-    MetadataTemplateVersionNotFoundException
-from eva_sub_cli.exceptions.submission_not_found_exception import SubmissionNotFoundException
-from eva_sub_cli.exceptions.submission_status_exception import SubmissionStatusException
+from eva_sub_cli.exceptions import InvalidFileTypeError, MetadataTemplateVersionException, \
+    MetadataTemplateVersionNotFoundException, SubmissionNotFoundException, SubmissionStatusException, \
+    NoVcfsFoundException
 from eva_sub_cli.file_utils import is_vcf_file
 from eva_sub_cli.metadata import EvaMetadataJson
 from eva_sub_cli.submission_ws import SubmissionWSClient
 from eva_sub_cli.submit import StudySubmitter, SUB_CLI_CONFIG_KEY_SUBMISSION_ID, \
     SUB_CLI_CONFIG_KEY_SUBMISSION_UPLOAD_URL
-from eva_sub_cli.utils import get_project_title_from_ena
+from eva_sub_cli.utils import get_project_title_from_ena, get_metadata_xlsx_template_link
 from eva_sub_cli.validators.docker_validator import DockerValidator
 from eva_sub_cli.validators.native_validator import NativeValidator
 from eva_sub_cli.validators.validator import READY_FOR_SUBMISSION_TO_EVA, ALL_VALIDATION_TASKS
@@ -115,6 +110,8 @@ def validate_vcf_mapping(vcf_mapping):
     :param vcf_mapping: iterable of triples (VCF file path, reference FASTA path, optional assembly report path)
     :return:
     """
+    if len(vcf_mapping) == 0:
+        raise NoVcfsFoundException('No VCF files detected in metadata')
     for vcf_file, fasta_file, report_file in vcf_mapping:
         if not (vcf_file and os.path.isfile(vcf_file)):
             raise FileNotFoundError(f'The variant file {vcf_file} does not exist, please check the file path.')
@@ -154,46 +151,6 @@ def get_project_and_vcf_fasta_mapping_from_metadata_json(metadata_json):
     return project_title, vcf_fasta_report_mapping
 
 
-def get_sub_cli_version():
-    if version.parse(eva_sub_cli.__version__).is_devrelease:
-        version_values = [int(v) for v in version.parse(eva_sub_cli.__version__).base_version.split('.')]
-        major = version_values[0]
-        minor = version_values[1] if len(version_values) > 1 else 0
-        patch = version_values[2] if len(version_values) > 2 else 0
-        if patch > 0:
-            patch -= 1
-        elif minor > 0:
-            minor -= 1
-            patch = 0
-        elif major > 0:
-            major -= 1
-            minor = 0
-            patch = 0
-        return f"{major}.{minor}.{patch}"
-    else:
-        return version.parse(eva_sub_cli.__version__).base_version
-
-
-@retry(exceptions=(HTTPError,), tries=3, delay=2, backoff=1.2, jitter=(1, 3))
-def get_sub_cli_github_tags():
-    url = f"https://api.github.com/repos/EBIvariation/eva-sub-cli/tags"
-    response = requests.get(url)
-    if response.status_code == 200:
-        tags = [tag["name"][1:] for tag in response.json()]
-        return tags
-    else:
-        return []
-
-
-def get_metadata_xlsx_template_link():
-    sub_cli_version = get_sub_cli_version()
-    sub_cli_tags = get_sub_cli_github_tags()
-    if sub_cli_version in sub_cli_tags:
-        return f'https://raw.githubusercontent.com/EBIvariation/eva-sub-cli/refs/tags/v{sub_cli_version}/eva_sub_cli/etc/EVA_Submission_template.xlsx'
-    else:
-        return 'https://raw.githubusercontent.com/EBIvariation/eva-sub-cli/main/eva_sub_cli/etc/EVA_Submission_template.xlsx'
-
-
 def verify_and_get_metadata_xlsx_version(metadata_xlsx, min_req_version):
     workbook = load_workbook(metadata_xlsx)
     instructions_sheet = workbook['PLEASE READ FIRST']

{eva_sub_cli-0.6.2 → eva_sub_cli-0.6.3}/eva_sub_cli/semantic_metadata.py

@@ -93,9 +93,13 @@ class SemanticMetadataChecker(AppLogger):
             self.check_taxonomy_code(project[TAX_ID_KEY], f'/{PROJECT_KEY}/{TAX_ID_KEY}')
         # Check sample taxonomies for novel samples
         for idx, sample in enumerate(self.metadata[SAMPLE_KEY]):
-            if BIOSAMPLE_OBJECT_KEY in sample and TAX_ID_KEY in sample[BIOSAMPLE_OBJECT_KEY][CHARACTERISTICS_KEY]:
-                self.check_taxonomy_code(sample[BIOSAMPLE_OBJECT_KEY][CHARACTERISTICS_KEY][TAX_ID_KEY][0]['text'],
-                                         f'/{SAMPLE_KEY}/{idx}/{BIOSAMPLE_OBJECT_KEY}/{CHARACTERISTICS_KEY}/{TAX_ID_KEY}')
+            if BIOSAMPLE_OBJECT_KEY in sample:
+                if TAX_ID_KEY in sample[BIOSAMPLE_OBJECT_KEY][CHARACTERISTICS_KEY]:
+                    self.check_taxonomy_code(sample[BIOSAMPLE_OBJECT_KEY][CHARACTERISTICS_KEY][TAX_ID_KEY][0]['text'],
+                                             f'/{SAMPLE_KEY}/{idx}/{BIOSAMPLE_OBJECT_KEY}/{CHARACTERISTICS_KEY}/{TAX_ID_KEY}')
+                else:
+                    self.add_error(f'/{SAMPLE_KEY}/{idx}/{BIOSAMPLE_OBJECT_KEY}/{CHARACTERISTICS_KEY}/{TAX_ID_KEY}',
+                                   f"must have required property '{TAX_ID_KEY}'")
 
     def check_uniqueness_analysis_alias(self):
         analyses = self.metadata[ANALYSIS_KEY]

{eva_sub_cli-0.6.2 → eva_sub_cli-0.6.3}/eva_sub_cli/submission_ws.py

@@ -7,7 +7,7 @@ from retry import retry
 
 from eva_sub_cli import SUBMISSION_WS_VAR
 from eva_sub_cli.auth import get_auth
-from eva_sub_cli.exceptions.submission_upload_exception import SubmissionUploadException
+from eva_sub_cli.exceptions import SubmissionUploadException
 
 DEFAULT_SUBMISSION_WS_URL = 'https://www.ebi.ac.uk/eva/webservices/submission-ws/v1/'
 

eva_sub_cli-0.6.3/eva_sub_cli/utils.py

@@ -0,0 +1,72 @@
+import requests
+from packaging import version
+from requests import HTTPError
+from retry import retry
+
+import eva_sub_cli
+from ebi_eva_common_pyutils.ena_utils import download_xml_from_ena
+
+
+def get_project_title_from_ena(project_accession):
+    try:
+        xml_root = download_xml_from_ena(f'https://www.ebi.ac.uk/ena/browser/api/xml/{project_accession}')
+        project_title = next(iter(xml_root.xpath('/PROJECT_SET/PROJECT/TITLE/text()')), None)
+    except HTTPError as e:
+        # We cannot currently differentiate between the service returning an error and the accession not existing
+        raise Exception(f"{project_accession} does not exist in ENA or is private")
+    except Exception as e:
+        raise Exception(f'Unexpected error occurred while getting project details from ENA for {project_accession}')
+
+    if not project_title:
+        raise Exception(f"{project_accession} does not exist in ENA or is private")
+
+    return project_title
+
+
+def get_sub_cli_version():
+    if version.parse(eva_sub_cli.__version__).is_devrelease:
+        version_values = [int(v) for v in version.parse(eva_sub_cli.__version__).base_version.split('.')]
+        major = version_values[0]
+        minor = version_values[1] if len(version_values) > 1 else 0
+        patch = version_values[2] if len(version_values) > 2 else 0
+        if patch > 0:
+            patch -= 1
+        elif minor > 0:
+            minor -= 1
+            patch = 0
+        elif major > 0:
+            major -= 1
+            minor = 0
+            patch = 0
+        return f"{major}.{minor}.{patch}"
+    else:
+        return version.parse(eva_sub_cli.__version__).base_version
+
+
+@retry(exceptions=(HTTPError,), tries=3, delay=2, backoff=1.2, jitter=(1, 3))
+def get_sub_cli_github_tags():
+    url = f"https://api.github.com/repos/EBIvariation/eva-sub-cli/tags"
+    response = requests.get(url)
+    if response.status_code == 200:
+        tags = [tag["name"][1:] for tag in response.json()]
+        return tags
+    else:
+        return []
+
+
+def get_metadata_xlsx_template_link():
+    sub_cli_version = get_sub_cli_version()
+    sub_cli_tags = get_sub_cli_github_tags()
+    if sub_cli_version in sub_cli_tags:
+        return f'https://raw.githubusercontent.com/EBIvariation/eva-sub-cli/refs/tags/v{sub_cli_version}/eva_sub_cli/etc/EVA_Submission_template.xlsx'
+    else:
+        return 'https://raw.githubusercontent.com/EBIvariation/eva-sub-cli/main/eva_sub_cli/etc/EVA_Submission_template.xlsx'
+
+
+def get_json_schema_link():
+    sub_cli_version = get_sub_cli_version()
+    sub_cli_tags = get_sub_cli_github_tags()
+    if sub_cli_version in sub_cli_tags:
+        return f'https://raw.githubusercontent.com/EBIvariation/eva-sub-cli/refs/tags/v{sub_cli_version}/eva_sub_cli/etc/eva_schema.json'
+    else:
+        return 'https://raw.githubusercontent.com/EBIvariation/eva-sub-cli/main/eva_sub_cli/etc/eva_schema.json'

{eva_sub_cli-0.6.2 → eva_sub_cli-0.6.3}/eva_sub_cli/validators/validator.py

@@ -14,6 +14,7 @@ from packaging import version
 
 import eva_sub_cli
 from eva_sub_cli import ETC_DIR, SUB_CLI_CONFIG_FILE, __version__
+from eva_sub_cli.utils import get_json_schema_link
 from eva_sub_cli.file_utils import resolve_single_file_path
 from eva_sub_cli.metadata import EvaMetadataJson
 from eva_sub_cli.report import generate_html_report, generate_text_report
@@ -448,6 +449,7 @@ class Validator(AppLogger):
             self._convert_biovalidator_validation_to_spreadsheet()
             self._write_spreadsheet_validation_results()
         self._collect_file_info_to_metadata()
+        self._add_schema_to_metadata()
 
     def _load_spreadsheet_conversion_errors(self):
         errors_file = resolve_single_file_path(os.path.join(self.output_dir, 'other_validations',
@@ -600,6 +602,12 @@ class Validator(AppLogger):
             else:
                 self.results[METADATA_CHECK]['json_errors'] = errors
 
+    def _add_schema_to_metadata(self):
+        if self.metadata_json_post_validation:
+            metadata = EvaMetadataJson(self.metadata_json_post_validation)
+            metadata.content['$schema'] = get_json_schema_link()
+            metadata.write(self.metadata_json_post_validation)
+
     def _update_metadata_with_evidence_type(self):
         if self.metadata_json_post_validation:
             metadata = EvaMetadataJson(self.metadata_json_post_validation)

{eva_sub_cli-0.6.2 → eva_sub_cli-0.6.3}/eva_sub_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eva_sub_cli
-Version: 0.6.2
+Version: 0.6.3
 Summary: EBI EVA - validation and submission command line tool
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
@@ -19,7 +19,7 @@ Classifier: License :: OSI Approved :: Apache Software License
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: ebi_eva_common_pyutils==0.*,>=0.7.4
+Requires-Dist: ebi_eva_common_pyutils>=0.7.4
 Requires-Dist: jinja2==3.*,>=3.0.0
 Requires-Dist: jsonschema==4.*
 Requires-Dist: openpyxl==3.*

{eva_sub_cli-0.6.2 → eva_sub_cli-0.6.3}/eva_sub_cli.egg-info/SOURCES.txt

@@ -26,6 +26,7 @@ eva_sub_cli/_version.py
 eva_sub_cli/auth.py
 eva_sub_cli/call_home.py
 eva_sub_cli/date_utils.py
+eva_sub_cli/exceptions.py
 eva_sub_cli/file_utils.py
 eva_sub_cli/metadata.py
 eva_sub_cli/orchestrator.py
@@ -48,12 +49,6 @@ eva_sub_cli/etc/eva_logo.png
 eva_sub_cli/etc/eva_schema.json
 eva_sub_cli/etc/spreadsheet2json_conf.yaml
 eva_sub_cli/etc/spreadsheet2json_conf_V2.yaml
-eva_sub_cli/exceptions/__init__.py
-eva_sub_cli/exceptions/invalid_file_type_exception.py
-eva_sub_cli/exceptions/metadata_template_version_exception.py
-eva_sub_cli/exceptions/submission_not_found_exception.py
-eva_sub_cli/exceptions/submission_status_exception.py
-eva_sub_cli/exceptions/submission_upload_exception.py
 eva_sub_cli/executables/__init__.py
 eva_sub_cli/executables/check_fasta_insdc.py
 eva_sub_cli/executables/check_metadata_semantics.py

{eva_sub_cli-0.6.2 → eva_sub_cli-0.6.3}/eva_sub_cli.egg-info/requires.txt

@@ -1,4 +1,4 @@
-ebi_eva_common_pyutils==0.*,>=0.7.4
+ebi_eva_common_pyutils>=0.7.4
 jinja2==3.*,>=3.0.0
 jsonschema==4.*
 openpyxl==3.*

{eva_sub_cli-0.6.2 → eva_sub_cli-0.6.3}/pyproject.toml

@@ -40,7 +40,7 @@ classifiers = [
 'format_metadata.py'='eva_sub_cli.executables.format_metadata:main'
 
 [tool.setuptools]
-packages = ['eva_sub_cli', 'eva_sub_cli.exceptions', 'eva_sub_cli.executables', 'eva_sub_cli.validators']
+packages = ['eva_sub_cli', 'eva_sub_cli.executables', 'eva_sub_cli.validators']
 
 [tool.setuptools.package-data]
 'eva_sub_cli'=['nextflow/*', 'etc/*', 'jinja_templates/*']

{eva_sub_cli-0.6.2 → eva_sub_cli-0.6.3}/requirements.txt

@@ -1,4 +1,4 @@
-ebi_eva_common_pyutils >= 0.7.4, == 0.*
+ebi_eva_common_pyutils >= 0.7.4
 jinja2 >= 3.0.0, == 3.*
 jsonschema == 4.*
 openpyxl == 3.*

{eva_sub_cli-0.6.2 → eva_sub_cli-0.6.3}/tests/test_cli.py

@@ -1,19 +1,13 @@
-import copy
-import logging
 import os
 import shutil
-import sys
 from unittest import TestCase
 from unittest.mock import patch, Mock
 
 from requests import HTTPError
 
 from eva_sub_cli import orchestrator
-from eva_sub_cli.exceptions.metadata_template_version_exception import MetadataTemplateVersionException, \
-    MetadataTemplateVersionNotFoundException
-from eva_sub_cli.exceptions.submission_not_found_exception import SubmissionNotFoundException
-from eva_sub_cli.exceptions.submission_status_exception import SubmissionStatusException
-from eva_sub_cli.exceptions.submission_upload_exception import SubmissionUploadException
+from eva_sub_cli.exceptions import MetadataTemplateVersionException, MetadataTemplateVersionNotFoundException, \
+     SubmissionNotFoundException, SubmissionStatusException, SubmissionUploadException
 from eva_sub_cli.executables import cli
 from eva_sub_cli.file_utils import DirLockError
 from tests.test_utils import touch
@@ -77,13 +71,13 @@ class TestCli(TestCase):
                           f'using this directory or a previous process did not terminate correctly. '
                           f'If the problem persists, remove the lock file manually.'), 65),
             (FileNotFoundError("The test_file does not exist"), 66),
-            (SubmissionNotFoundException("submission not found"), 67),
-            (SubmissionStatusException("can't get submission status"), 68),
-            (MetadataTemplateVersionException("Metadata template version lower than expected"), 69),
-            (MetadataTemplateVersionNotFoundException("Metadata template version not found"), 70),
-            (SubmissionUploadException("Error while uploading submission: File size in metadata json does not match with the size of the file uploaded"), 71),
-            (http_error, 72),
-            (Exception("Exception occurred while processing"), 73),
+            (SubmissionNotFoundException("submission not found"), 68),
+            (SubmissionStatusException("can't get submission status"), 69),
+            (MetadataTemplateVersionException("Metadata template version lower than expected"), 70),
+            (MetadataTemplateVersionNotFoundException("Metadata template version not found"), 71),
+            (SubmissionUploadException("Error while uploading submission: File size in metadata json does not match with the size of the file uploaded"), 72),
+            (http_error, 73),
+            (Exception("Exception occurred while processing"), 74),
         ]
 
         for exception, expected_exit in test_cases:
@@ -108,7 +102,7 @@ class TestCli(TestCase):
                     )
                     self.assertIn(str(exception), printed_texts)
 
-                    if (isinstance(exception, HTTPError)):
+                    if isinstance(exception, HTTPError):
                         self.assertIn(exception.response.text, printed_texts)
 
     def test_main_sends_start_and_end_on_success(self):