Use from __future__ import annotations in tests

atztogo · atztogo · commit 008a290608ee · 2022-08-07T12:22:49.000+09:00
diff --git a/python/spglib/spglib.py b/python/spglib/spglib.py
@@ -34,7 +34,6 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 import warnings
-from typing import Dict, Optional
 
 import numpy as np
 
@@ -745,7 +744,7 @@ def get_spacegroup_type(hall_number):
 
 def get_spacegroup_type_from_symmetry(
     rotations, translations, lattice=None, symprec=1e-5
-) -> Optional[Dict]:
+):
     """Space group type information is obtained from a set of symmetry operations.
 
     Parameters
diff --git a/python/test/conftest.py b/python/test/conftest.py
@@ -1,7 +1,8 @@
 """Pytest configuration."""
-from io import StringIO
+from __future__ import annotations
+
 from pathlib import Path
-from typing import Callable, List, Tuple
+from typing import Callable
 
 import numpy as np
 import pytest
@@ -22,13 +23,13 @@
 
 
 @pytest.fixture(scope="session")
-def dirnames() -> Tuple:
+def dirnames() -> list[Path]:
     """Return test directory names."""
-    return (_data_dir / d for d in _dirnames)
+    return [_data_dir / d for d in _dirnames]
 
 
 @pytest.fixture(scope="session")
-def all_filenames() -> List:
+def all_filenames() -> list:
     """Return all filenames in test directories."""
     all_filenames = []
     for d in (_data_dir / _d for _d in _dirnames):
@@ -44,13 +45,12 @@ def _read_vasp(filename):
         with open(filename) as f:
             lines = f.readlines()
             return _get_cell(lines)
-        return None
 
     return _read_vasp
 
 
-def read_vasp_from_strings(strings):
-    return _get_cell(StringIO(strings).readlines())
+# def read_vasp_from_strings(strings):
+#     return _get_cell(StringIO(strings).readlines())
 
 
 def _get_cell(lines):
diff --git a/python/test/test_spacegrouop_type_from_symmetry.py b/python/test/test_spacegrouop_type_from_symmetry.py
@@ -1,7 +1,9 @@
 """Test of spacegroup_type_from_symmetry."""
+from __future__ import annotations
+
 import os
 from pathlib import Path
-from typing import Callable, List
+from typing import Callable
 
 import pytest
 
@@ -16,7 +18,7 @@
 
 @pytest.mark.parametrize("lattice_None", [True, False])
 def test_spacegroup_type_from_symmetry(
-    all_filenames: List[Path], read_vasp: Callable, lattice_None: bool
+    all_filenames: list[Path], read_vasp: Callable, lattice_None: bool
 ):
     """Test spacegroup_type_from_symmetry."""
     for fname in all_filenames:
