Merge pull request #323 from tovrstra/importlib-resources

Remove import_resources try-except block

iodata/test/common.py

@@ -20,6 +20,7 @@
 
 import os
 from contextlib import contextmanager
+from importlib.resources import as_file, files
 from typing import Optional
 
 import numpy as np
@@ -31,11 +32,6 @@
 from ..overlap import compute_overlap
 from ..utils import FileFormatWarning
 
-try:
-    from importlib_resources import as_file, files
-except ImportError:
-    from importlib.resources import as_file, files
-
 __all__ = [
     "compute_mulliken_charges",
     "compute_1rdm",

iodata/test/test_charmm.py

@@ -18,16 +18,13 @@
 # --
 """Test iodata.formats.orcalog module."""
 
+from importlib.resources import as_file, files
+
 from numpy.testing import assert_allclose, assert_equal
 
 from ..api import load_one
 from ..utils import amu, angstrom
 
-try:
-    from importlib_resources import as_file, files
-except ImportError:
-    from importlib.resources import as_file, files
-
 
 def test_load_crambin():
     # test CHARMM crd file of crambin

iodata/test/test_chgcar.py

@@ -18,17 +18,14 @@
 # --
 """Test iodata.formats.chgcar module."""
 
+from importlib.resources import as_file, files
+
 import numpy as np
 from numpy.testing import assert_allclose, assert_equal
 
 from ..api import load_one
 from ..utils import angstrom, volume
 
-try:
-    from importlib_resources import as_file, files
-except ImportError:
-    from importlib.resources import as_file, files
-
 
 def test_load_chgcar_oxygen():
     with as_file(files("iodata.test.data").joinpath("CHGCAR.oxygen")) as fn:

iodata/test/test_cli.py

@@ -22,17 +22,13 @@
 import os
 import subprocess
 import sys
+from importlib.resources import as_file, files
 
 from numpy.testing import assert_allclose, assert_equal
 
 from ..__main__ import convert
 from ..api import load_many, load_one
 
-try:
-    from importlib_resources import as_file, files
-except ImportError:
-    from importlib.resources import as_file, files
-
 
 def _check_convert_one(myconvert, tmpdir):
     outfn = os.path.join(tmpdir, "tmp.xyz")

iodata/test/test_cp2klog.py

@@ -18,18 +18,15 @@
 # --
 """Test iodata.formats.cp2klog module."""
 
+from importlib.resources import as_file, files
+
 import pytest
 from numpy.testing import assert_allclose, assert_equal
 
 from ..api import load_one
 from ..overlap import compute_overlap
 from .common import check_orthonormal, truncated_file
 
-try:
-    from importlib_resources import as_file, files
-except ImportError:
-    from importlib.resources import as_file, files
-
 
 def test_atom_si_uks():
     with as_file(files("iodata.test.data").joinpath("atom_si.cp2k.out")) as fn_out:

iodata/test/test_cube.py

@@ -18,16 +18,13 @@
 # --
 """Test iodata.formats.cube module."""
 
+from importlib.resources import as_file, files
+
 import numpy as np
 from numpy.testing import assert_allclose, assert_equal
 
 from ..api import dump_one, load_one
 
-try:
-    from importlib_resources import as_file, files
-except ImportError:
-    from importlib.resources import as_file, files
-
 
 def test_load_aelta():
     with as_file(files("iodata.test.data").joinpath("aelta.cube")) as fn_cube:

iodata/test/test_extxyz.py

@@ -18,17 +18,14 @@
 # --
 """Test iodata.formats.extxyz module."""
 
+from importlib.resources import as_file, files
+
 import numpy as np
 from numpy.testing import assert_allclose, assert_equal
 
 from ..api import load_many, load_one
 from ..utils import angstrom
 
-try:
-    from importlib_resources import as_file, files
-except ImportError:
-    from importlib.resources import as_file, files
-
 
 def test_load_fcc_extended():
     with as_file(files("iodata.test.data").joinpath("al_fcc.xyz")) as fn_xyz:

iodata/test/test_fchk.py

@@ -19,6 +19,7 @@
 """Test iodata.formats.fchk module."""
 
 import os
+from importlib.resources import as_file, files
 from typing import Optional
 
 import numpy as np
@@ -31,11 +32,6 @@
 from .common import check_orthonormal, compare_mols, compute_1rdm, load_one_warning
 from .test_molekel import compare_mols_diff_formats
 
-try:
-    from importlib_resources import as_file, files
-except ImportError:
-    from importlib.resources import as_file, files
-
 
 def test_load_fchk_nonexistent():
     with (

iodata/test/test_fcidump.py

@@ -19,17 +19,13 @@
 """Test iodata.formats.fcidump module."""
 
 import os
+from importlib.resources import as_file, files
 
 import numpy as np
 from numpy.testing import assert_allclose, assert_equal
 
 from ..api import dump_one, load_one
 
-try:
-    from importlib_resources import as_file, files
-except ImportError:
-    from importlib.resources import as_file, files
-
 
 def test_load_fcidump_psi4_h2():
     with as_file(files("iodata.test.data").joinpath("FCIDUMP.psi4.h2")) as fn:

iodata/test/test_gamess.py

@@ -18,16 +18,13 @@
 # --
 """Test iodata.formats.gamess module."""
 
+from importlib.resources import as_file, files
+
 from numpy.testing import assert_allclose, assert_equal
 
 from ..api import load_one
 from ..utils import angstrom
 
-try:
-    from importlib_resources import as_file, files
-except ImportError:
-    from importlib.resources import as_file, files
-
 
 def test_load_one_gamess_punch():
     with as_file(files("iodata.test.data").joinpath("PCGamess_PUNCH.dat")) as f:

iodata/test/test_gaussianinput.py

@@ -18,17 +18,14 @@
 # --
 """Test iodata.formats.gaussianinput module."""
 
+from importlib.resources import as_file, files
+
 import numpy as np
 from numpy.testing import assert_allclose, assert_equal, assert_raises
 
 from ..api import load_one
 from ..utils import angstrom
 
-try:
-    from importlib_resources import as_file, files
-except ImportError:
-    from importlib.resources import as_file, files
-
 
 def test_load_water_com():
     # test .com with Link 0 section

iodata/test/test_gaussianlog.py

@@ -18,15 +18,12 @@
 # --
 """Test iodata.formats.log module."""
 
+from importlib.resources import as_file, files
+
 from numpy.testing import assert_allclose, assert_equal
 
 from ..api import load_one
 
-try:
-    from importlib_resources import as_file, files
-except ImportError:
-    from importlib.resources import as_file, files
-
 
 def load_log_helper(fn_log):
     """Load a testing Gaussian log file with iodata.load_one."""

iodata/test/test_gromacs.py

@@ -18,16 +18,13 @@
 # --
 """Test iodata.formats.gromacs module."""
 
+from importlib.resources import as_file, files
+
 from numpy.testing import assert_allclose, assert_equal
 
 from ..api import load_many, load_one
 from ..utils import nanometer, picosecond
 
-try:
-    from importlib_resources import as_file, files
-except ImportError:
-    from importlib.resources import as_file, files
-
 
 def test_load_water():
     # test gro file of one water

iodata/test/test_inputs.py

@@ -19,6 +19,7 @@
 """Test iodata.inputs module."""
 
 import os
+from importlib.resources import as_file, files
 
 import numpy as np
 import pytest
@@ -28,11 +29,6 @@
 from ..periodic import num2sym
 from ..utils import FileFormatWarning, angstrom
 
-try:
-    from importlib_resources import as_file, files
-except ImportError:
-    from importlib.resources import as_file, files
-
 
 def check_load_input_and_compare(fname: str, fname_expected: str):
     """Load saved input file and compare to expected input file.

iodata/test/test_iodata.py

@@ -19,6 +19,8 @@
 # ruff: noqa: SLF001
 """Test iodata.iodata module."""
 
+from importlib.resources import as_file, files
+
 import numpy as np
 import pytest
 from numpy.testing import assert_allclose, assert_equal
@@ -27,11 +29,6 @@
 from ..overlap import compute_overlap
 from .common import compute_1rdm
 
-try:
-    from importlib_resources import as_file, files
-except ImportError:
-    from importlib.resources import as_file, files
-
 
 def test_typecheck():
     m = IOData(atcoords=np.array([[1, 2, 3], [2, 3, 1]]))

iodata/test/test_json.py

@@ -20,19 +20,14 @@
 
 import json
 import os
+from importlib.resources import as_file, files
 
 import numpy as np
 import pytest
 
 from ..api import dump_one, load_one
 from ..utils import FileFormatError, FileFormatWarning
 
-try:
-    from importlib_resources import as_file, files
-except ImportError:
-    from importlib.resources import as_file, files
-
-
 # Tests for qcschema_molecule
 # GEOMS: dict of str: NDArray(N, 3)
 GEOMS = {

iodata/test/test_locpot.py

@@ -18,16 +18,13 @@
 # --
 """Test iodata.formats.locpot module."""
 
+from importlib.resources import as_file, files
+
 from numpy.testing import assert_allclose, assert_equal
 
 from ..api import load_one
 from ..utils import angstrom, electronvolt, volume
 
-try:
-    from importlib_resources import as_file, files
-except ImportError:
-    from importlib.resources import as_file, files
-
 
 def test_load_locpot_oxygen():
     with as_file(files("iodata.test.data").joinpath("LOCPOT.oxygen")) as fn:

iodata/test/test_mol2.py

@@ -19,6 +19,7 @@
 """Test iodata.formats.mol2 module."""
 
 import os
+from importlib.resources import as_file, files
 
 import pytest
 from numpy.testing import assert_allclose, assert_equal
@@ -28,11 +29,6 @@
 from ..utils import angstrom
 from .common import truncated_file
 
-try:
-    from importlib_resources import as_file, files
-except ImportError:
-    from importlib.resources import as_file, files
-
 
 def test_mol2_load_one():
     # test mol2 one structure

iodata/test/test_molden.py

@@ -20,6 +20,7 @@
 
 import os
 import warnings
+from importlib.resources import as_file, files
 
 import attrs
 import numpy as np
@@ -33,11 +34,6 @@
 from ..utils import FileFormatWarning, LineIterator, angstrom
 from .common import check_orthonormal, compare_mols, compute_mulliken_charges
 
-try:
-    from importlib_resources import as_file, files
-except ImportError:
-    from importlib.resources import as_file, files
-
 
 def test_load_molden_li2_orca():
     with (

iodata/test/test_molekel.py

@@ -20,6 +20,7 @@
 
 import os
 import warnings
+from importlib.resources import as_file, files
 from typing import Optional
 
 from numpy.testing import assert_allclose, assert_equal
@@ -30,11 +31,6 @@
 from ..utils import angstrom
 from .common import check_orthonormal, compare_mols, compute_mulliken_charges, load_one_warning
 
-try:
-    from importlib_resources import as_file, files
-except ImportError:
-    from importlib.resources import as_file, files
-
 
 def compare_mols_diff_formats(mol1, mol2):
     """Compare two IOData objects loaded from different formats."""