make pytest and mypy happy

Ensembl · May 10, 2024 · eade269 · eade269
1 parent 202a808
commit eade269
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/src/python/tests/database/test_factory.py b/src/python/tests/database/test_factory.py
@@ -20,7 +20,7 @@
 """
 
 from pathlib import Path
-from typing import Dict, List, Optional
+from typing import Dict, List, Optional, Union
 from unittest.mock import call, Mock, patch
 
 from deepdiff import DeepDiff
@@ -129,7 +129,7 @@ def test_format_db_data(
         output: Expected list of dictionaries with metadata per database.
     """
 
-    def _get_meta_value(meta_key: str) -> Optional[str]:
+    def _get_meta_value(meta_key: str) -> Optional[Union[int, str]]:
         """Return empty string if "species.division" is requested in BRC mode, "Metazoa" otherwise."""
         if (meta_key == "species.division") and brc_mode:
             return ""

diff --git a/src/python/tests/genome_metadata/test_extend/genome.json b/src/python/tests/genome_metadata/test_extend/genome.json
@@ -1,9 +1,4 @@
 {
-    "veupathdb": {
-        "build_version": 65,
-        "component_db": "PlasmoDB",
-        "organism_abbrev": "pfal3D7"
-    },
     "assembly": {
         "accession": "GCA_000002765.1",
         "provider_name": "RefSeq",
@@ -17,5 +12,10 @@
     "species": {
         "scientific_name": "Plasmodium falciparum",
         "taxonomy_id": 36329
+    },
+    "veupathdb": {
+        "build_version": 65,
+        "component_db": "PlasmoDB",
+        "organism_abbrev": "pfal3D7"
     }
 }
diff --git a/src/python/tests/genome_metadata/test_extend/updated_genome.json b/src/python/tests/genome_metadata/test_extend/updated_genome.json
@@ -1,9 +1,4 @@
 {
-    "veupathdb": {
-        "build_version": 65,
-        "component_db": "PlasmoDB",
-        "organism_abbrev": "pfal3D7"
-    },
     "added_seq": {
         "region_name": [
             "CP089275",
@@ -24,5 +19,10 @@
     "species": {
         "scientific_name": "Plasmodium falciparum",
         "taxonomy_id": 36329
+    },
+    "veupathdb": {
+        "build_version": 65,
+        "component_db": "PlasmoDB",
+        "organism_abbrev": "pfal3D7"
     }
 }