Drop unused importlib syntax for python 3.8

polaris/cache.py

@@ -1,4 +1,5 @@
 import argparse
+import importlib.resources as imp_res
 import json
 import os
 import pickle
@@ -9,7 +10,6 @@
 
 from polaris import Step
 from polaris.config import PolarisConfigParser
-from polaris.io import imp_res
 
 
 def update_cache(step_paths, date_string=None, dry_run=False):

polaris/component.py

@@ -1,7 +1,6 @@
+import importlib.resources as imp_res
 import json
 
-from polaris.io import imp_res
-
 
 class Component:
     """

polaris/io.py

@@ -1,15 +1,7 @@
 import os
-import sys
 import tempfile
-from typing import TYPE_CHECKING  # noqa: F401
 from urllib.parse import urlparse
 
-if TYPE_CHECKING or sys.version_info >= (3, 9, 0):
-    import importlib.resources as imp_res  # noqa: F401
-else:
-    # python <= 3.8
-    import importlib_resources as imp_res  # noqa: F401
-
 import progressbar
 import requests
 

polaris/job/__init__.py

@@ -1,10 +1,9 @@
+import importlib.resources as imp_res
 import os
 
 import numpy as np
 from jinja2 import Template
 
-from polaris.io import imp_res
-
 
 def write_job_script(config, machine, target_cores, min_cores, work_dir,
                      suite=''):

polaris/list.py

@@ -1,10 +1,10 @@
 import argparse
+import importlib.resources as imp_res
 import os
 import re
 import sys
 
 from polaris.components import get_components
-from polaris.io import imp_res
 
 
 def list_cases(task_expr=None, number=None, verbose=False):

polaris/machines/__init__.py

@@ -1,13 +1,7 @@
+import importlib.resources as imp_res
 import os
 import socket
 import sys
-from typing import TYPE_CHECKING  # noqa: F401
-
-if TYPE_CHECKING or sys.version_info >= (3, 9, 0):
-    import importlib.resources as imp_res  # noqa: F401
-else:
-    # python <= 3.8
-    import importlib_resources as imp_res  # noqa: F401
 
 from mache import discover_machine as mache_discover_machine
 

polaris/namelist.py

@@ -1,7 +1,6 @@
+import importlib.resources as imp_res
 from typing import Dict
 
-from polaris.io import imp_res
-
 
 def parse_replacements(package, namelist):
     """

polaris/ocean/vertical/grid_1d.py

@@ -1,12 +1,11 @@
+import importlib.resources as imp_res
 import json
 
 import numpy
 import numpy as np
 from netCDF4 import Dataset
 from scipy.optimize import root_scalar
 
-from polaris.io import imp_res
-
 
 def generate_1d_grid(config):
     """

polaris/seaice/tasks/single_column/standard_physics/viz.py

@@ -1,11 +1,4 @@
-import sys
-from typing import TYPE_CHECKING  # noqa: F401
-
-if TYPE_CHECKING or sys.version_info >= (3, 9, 0):
-    import importlib.resources as imp_res  # noqa: F401
-else:
-    # python <= 3.8
-    import importlib_resources as imp_res  # noqa: F401
+import importlib.resources as imp_res
 
 import matplotlib.pyplot as plt
 import xarray as xr

polaris/step.py

@@ -1,4 +1,5 @@
 import grp
+import importlib.resources as imp_res
 import logging
 import os
 import shutil
@@ -8,7 +9,7 @@
 from mache import MachineInfo
 
 from polaris.config import PolarisConfigParser
-from polaris.io import download, imp_res, symlink
+from polaris.io import download, symlink
 from polaris.validate import compare_variables
 
 

polaris/streams.py

@@ -1,10 +1,9 @@
+import importlib.resources as imp_res
 from copy import deepcopy
 
 from jinja2 import Template
 from lxml import etree
 
-from polaris.io import imp_res
-
 
 def read(package, streams_filename, tree=None, replacements=None):
     """

polaris/suite.py

@@ -1,8 +1,8 @@
 import argparse
+import importlib.resources as imp_res
 import sys
 from typing import List
 
-from polaris.io import imp_res
 from polaris.setup import setup_tasks
 
 

polaris/viz/style.py

@@ -1,11 +1,4 @@
-import sys
-from typing import TYPE_CHECKING  # noqa: F401
-
-if TYPE_CHECKING or sys.version_info >= (3, 9, 0):
-    import importlib.resources as imp_res  # noqa: F401
-else:
-    # python <= 3.8
-    import importlib_resources as imp_res  # noqa: F401
+import importlib.resources as imp_res
 
 import matplotlib.pyplot as plt
 

polaris/yaml.py

@@ -1,13 +1,12 @@
 import argparse
+import importlib.resources as imp_res
 from collections import OrderedDict
 from typing import Dict
 
 from jinja2 import Template
 from lxml import etree
 from ruamel.yaml import YAML
 
-from polaris.io import imp_res
-
 
 class PolarisYaml:
     """