Py source consistency using isort and pyupgrade tools, rm unused imports (#163)

Also remove unused shebangs on non-executable module and test files

Author: mwtoews

docs/conf.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 #
 # pymt documentation build configuration file, created by
 # sphinx-quickstart on Fri Jun  9 13:47:02 2017.
@@ -25,7 +24,6 @@
 
 import pymt
 
-
 if os.environ.get("READTHEDOCS", ""):
     # RTD doesn't use the repo's Makefile to build docs.
     import subprocess
@@ -69,9 +67,9 @@
 master_doc = "index"
 
 # General information about the project.
-project = u"pymt"
-copyright = u"2018, Eric Hutton"
-author = u"Eric Hutton"
+project = "pymt"
+copyright = "2018, Eric Hutton"
+author = "Eric Hutton"
 
 # The version info for the project you're documenting, acts as replacement
 # for |version| and |release|, also used in various other places throughout
@@ -147,15 +145,15 @@
 # (source start file, target name, title, author, documentclass
 # [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, "pymt.tex", u"pymt Documentation", u"Eric Hutton", "manual")
+    (master_doc, "pymt.tex", "pymt Documentation", "Eric Hutton", "manual")
 ]
 
 
 # -- Options for manual page output ------------------------------------
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [(master_doc, "pymt", u"pymt Documentation", [author], 1)]
+man_pages = [(master_doc, "pymt", "pymt Documentation", [author], 1)]
 
 
 # -- Options for Texinfo output ----------------------------------------
@@ -167,7 +165,7 @@
     (
         master_doc,
         "pymt",
-        u"pymt Documentation",
+        "pymt Documentation",
         author,
         "pymt",
         "One line description of project.",

docs/scripts/make_table.py

@@ -1,10 +1,10 @@
 #! /usr/bin/env python
 import os
 import textwrap
-from tabulate import tabulate
 
 import click
 import yaml
+from tabulate import tabulate
 
 
 def construct_rows(notebook_index=None):
@@ -20,7 +20,7 @@ def construct_rows(notebook_index=None):
                 [
                     summary,
                     "",
-                    "|binder-{0}|".format(name),
+                    f"|binder-{name}|",
                 ]
             )
         rows.append((name, summary))
@@ -59,12 +59,10 @@ def make_table(dest, notebook_index):
     footer = []
     for name, notebooks in index.items():
         footer.append(
+            f"""
+            .. |binder-{name}| image:: https://mybinder.org/badge_logo.svg
+                :target: https://mybinder.org/v2/gh/csdms/pymt.git/master?filepath=notebooks%2F{notebooks[0]}
             """
-            .. |binder-{0}| image:: https://mybinder.org/badge_logo.svg
-                :target: https://mybinder.org/v2/gh/csdms/pymt.git/master?filepath=notebooks%2F{1}
-            """.format(
-                name, notebooks[0]
-            )
         )
     print(textwrap.dedent(os.linesep.join(footer)), file=dest)
 

notebooks/conftest.py

@@ -2,16 +2,15 @@
 
 import pytest
 
-
 _TEST_DIR = pathlib.Path(__file__).absolute().parent
 
 
 def collect_notebooks(src):
     p = pathlib.Path(src)
     if p.is_dir():
-        return set([_p.absolute() for _p in iter_notebooks_in_dir(p, src)])
+        return {_p.absolute() for _p in iter_notebooks_in_dir(p, src)}
     else:
-        raise ValueError("{0}: not a directory".format(src))
+        raise ValueError(f"{src}: not a directory")
 
 
 def iter_notebooks_in_dir(path, root):

notebooks/test_notebooks.py

@@ -6,8 +6,8 @@
 
 _exclude_file = pathlib.Path(__file__).absolute().parent / "exclude.yml"
 if _exclude_file.exists():
-    with open(_exclude_file, "r") as fp:
-        _EXCLUDE = dict([(item["file"], item["reason"]) for item in yaml.safe_load(fp)])
+    with open(_exclude_file) as fp:
+        _EXCLUDE = {item["file"]: item["reason"] for item in yaml.safe_load(fp)}
 else:
     _EXCLUDE = {}
 

pymt/__init__.py

@@ -1,6 +1,6 @@
-from ._version import __version__
-
 from gimli import UnitSystem
+
+from ._version import __version__
 from .model_collection import ModelCollection
 
 MODELS = ModelCollection()

pymt/errors.py

@@ -1,6 +1,3 @@
-#! /usr/bin/env python
-
-
 class PymtError(Exception):
 
     pass

pymt/framework/bmi_bridge.py

@@ -4,23 +4,22 @@
 import os
 from pprint import pformat
 
+import gimli
 import numpy as np
 import yaml
-import gimli
 
 from deprecated import deprecated
 
-from ..utils import as_cwd
 from ..errors import BmiError
 from ..units import transform_azimuth_to_math, transform_math_to_azimuth
+from ..utils import as_cwd
 from .bmi_docstring import bmi_docstring
 from .bmi_mapper import GridMapperMixIn
 from .bmi_plot import quick_plot
 from .bmi_setup import SetupMixIn
 from .bmi_timeinterp import BmiTimeInterpolator
 from .bmi_ugrid import dataset_from_bmi_grid
 
-
 UNITS = gimli.units
 
 

pymt/framework/bmi_docstring.py

@@ -1,9 +1,7 @@
-#! /usr/bin/env python
 import jinja2
 from landlab.core.messages import format_message
 from model_metadata import MetadataNotFoundError, ModelMetadata
 
-
 # {{ desc|trim|wordwrap(70) if desc }}
 _DOCSTRING = """
 Basic Model Interface for {{ name }}.

pymt/framework/bmi_mapper.py

@@ -1,4 +1,3 @@
-#! /usr/bin/env python
 import warnings
 
 import numpy as np

pymt/framework/bmi_plot.py

@@ -1,4 +1,3 @@
-#! /usr/bin/env python
 import matplotlib.pyplot as plt
 import numpy as np