rufff

Author: phobson

check_pygridtools.py

@@ -5,7 +5,7 @@
 matplotlib.use('agg')
 style.use('classic')
 
-import pygridtools
+import pygridtools  #  noqa: E402
 
 
 if '--strict' in sys.argv:

pygridtools/__init__.py

@@ -1,7 +1,7 @@
-from .misc import *
-from .core import *
-from . import iotools
-from . import viz
-from . import validate
+from .misc import *  # noqa: F403
+from .core import *  # noqa: F403
+from . import iotools  # noqa: F401
+from . import viz  # noqa: F401
+from . import validate  # noqa: F401
 
-from .tests import test, teststrict
+from .tests import test, teststrict  # noqa: F401

pygridtools/core.py

@@ -1,4 +1,3 @@
-from __future__ import division
 
 import warnings
 from copy import deepcopy
@@ -198,7 +197,7 @@ def extract(nodes, jstart=None, istart=None, jend=None, iend=None):
     return deepcopy(nodes[jstart:jend, istart:iend])
 
 
-class ModelGrid(object):
+class ModelGrid:
     """
     Container for a curvilinear-orthogonal grid. Provides convenient
     access to masking, manipulation, and visualization methods.
@@ -825,10 +824,7 @@ def to_point_geodataframe(self, which='nodes', usemask=True, elev=None):
 
     def to_polygon_geodataframe(self, usemask=True, elev=None):
         x, y = self._get_x_y(which='nodes', usemask=False)
-        if usemask:
-            mask = self.cell_mask.copy()
-        else:
-            mask = None
+        mask = self.cell_mask.copy() if usemask else None
 
         return misc.gdf_of_cells(x, y, mask, crs=self.crs, elev=elev, triangles=False)
 

pygridtools/gefdc.py

@@ -7,8 +7,6 @@
 from shapely.geometry import Point
 import geopandas
 
-from pygridtools import iotools
-from pygridtools import misc
 from pygridtools import validate
 
 
@@ -93,7 +91,7 @@ def write_cellinp(cell_array, outputfile='cell.inp', mode='w',
     nrows, ncols = cell_array.shape
 
     rowfmt = '{0:3d}  {1:s}\n'
-    colfmt = f'{{:0{_n_digits(ncols)}d}}'
+    # colfmt = f'{{:0{_n_digits(ncols)}d}}'
 
     if cell_array.shape[1] > maxcols:
         first_array = cell_array[:, :maxcols]
@@ -108,7 +106,7 @@ def write_cellinp(cell_array, outputfile='cell.inp', mode='w',
 
     else:
         columns = numpy.arange(1, maxcols + 1, dtype=int)
-        colstr = [list('{:04d}'.format(c)) for c in columns]
+        colstr = [list(f'{c:04d}') for c in columns]
         hundreds = ''.join([c[1] for c in colstr])
         tens = ''.join([c[2] for c in colstr])
         ones = ''.join([c[3] for c in colstr])
@@ -117,19 +115,16 @@ def write_cellinp(cell_array, outputfile='cell.inp', mode='w',
             if writeheader:
                 title = 'C -- cell.inp for EFDC model by pygridtools\n'
                 outfile.write(title)
-                outfile.write('C    {}\n'.format(hundreds[:ncols]))
-                outfile.write('C    {}\n'.format(tens[:ncols]))
-                outfile.write('C    {}\n'.format(ones[:ncols]))
+                outfile.write(f'C    {hundreds[:ncols]}\n')
+                outfile.write(f'C    {tens[:ncols]}\n')
+                outfile.write(f'C    {ones[:ncols]}\n')
 
             for n, row in enumerate(cell_array):
                 row_number = nrows - n
                 row_strings = row.astype(str)
                 cell_text = ''.join(row_strings.tolist())
-                if rowlabels:
-                    rowheader = ''
-                    row_text = rowfmt.format(int(row_number), cell_text)
-                else:
-                    row_text = '     {0:s}\n'.format(cell_text)
+
+                row_text = rowfmt.format(int(row_number), cell_text) if rowlabels else f'     {cell_text:s}\n'
 
                 outfile.write(row_text)
 
@@ -153,7 +148,7 @@ def write_gridout_file(xcoords, ycoords, outfile):
     })
 
     with Path(outfile).open('w') as f:
-        f.write('## {:d} x {:d}\n'.format(nx, ny))
+        f.write(f'## {nx:d} x {ny:d}\n')
 
     # XXX: https://github.com/pandas-dev/pandas/issues/21882
     with Path(outfile).open('a') as f:
@@ -295,8 +290,8 @@ def make_gefdc_cells(node_mask, cell_mask=None, triangles=False):
             if total == bank_cell * shift**2:
                 cells[cj, ci] = land_cell
 
-    nrows = cells.shape[0]
-    ncols = cells.shape[1]
+    # nrows = cells.shape[0]
+    # ncols = cells.shape[1]
 
     # nchunks = numpy.ceil(ncols / maxcols)
     # if ncols > maxcols:

pygridtools/iotools.py

@@ -1,12 +1,7 @@
-import os
-from collections import OrderedDict
-from textwrap import dedent
 import warnings
 
 import numpy
-import pandas
 from matplotlib import pyplot
-from shapely.geometry import Point, Polygon
 import geopandas
 
 try:
@@ -17,8 +12,6 @@
 from pygridgen.tests import requires
 import pygridgen as pgg
 
-from pygridtools import misc
-from pygridtools import validate
 from pygridtools import viz
 
 
@@ -235,7 +228,7 @@ def interactive_grid_shape(grid, max_n=200, plotfxn=None, **kwargs):
     )
 
 
-class _FocusProperties():
+class _FocusProperties:
     """A dummy class to hold the properties of the grid._FocusPoint() object.
     This class is required so that multiple ipywidgets.interactive widgets
     can interact on the same plot.
@@ -437,6 +430,6 @@ def interactive_grid_focus(g, n_points, plotfxn=None, **kwargs):
     tab_nest = ipywidgets.Tab()
     tab_nest.children = widgets
     for n in range(len(widgets)):
-        tab_nest.set_title(n, 'Focus {}'.format(n + 1))
+        tab_nest.set_title(n, f'Focus {n + 1}')
 
     return focus_points, tab_nest

pygridtools/misc.py

@@ -1,10 +1,10 @@
 from collections import OrderedDict
 from shapely.geometry import Point, Polygon
+import importlib
 
 import numpy
 import matplotlib.path as mpath
 import pandas
-from shapely import geometry
 import geopandas
 from pygridgen import csa
 
@@ -81,7 +81,7 @@ def make_record(ID, coords, geomtype, props):
     """
 
     if geomtype not in ['Point', 'LineString', 'Polygon']:
-        raise ValueError('Geometry {} not suppered'.format(geomtype))
+        raise ValueError(f'Geometry {geomtype} not suppered')
 
     if isinstance(coords, numpy.ma.MaskedArray):
         coords = coords.data
@@ -123,10 +123,9 @@ def interpolate_bathymetry(bathy, x_points, y_points, xcol='x', ycol='y', zcol='
 
     """
 
-    try:
-        import pygridgen
-    except ImportError:  # pragma: no cover
-        raise ImportError("`pygridgen` not installed. Cannot interpolate bathymetry.")
+    HASPGG = bool(importlib.util.find_spec("pygridgen"))
+    if not HASPGG:
+        raise RuntimeError("`pygridgen` not installed. Cannot interpolate bathymetry.")
 
     if bathy is None:
         elev = numpy.zeros(x_points.shape)
@@ -372,7 +371,7 @@ def gdf_of_cells(X, Y, mask, crs, elev=None, triangles=False):
                 # build the attributes
                 record = OrderedDict(
                     id=row, ii=ii + 2, jj=jj + 2, elev=Z,
-                    ii_jj='{:02d}_{:02d}'.format(ii + 2, jj + 2),
+                    ii_jj=f'{ii + 2:02d}_{jj + 2:02d}',
                     geometry=Polygon(shell=coords)
                 )
 
@@ -428,7 +427,7 @@ def gdf_of_points(X, Y, crs, elev=None):
                 record = OrderedDict(
                     id=int(row), ii=int(ii + 2), jj=int(jj + 2),
                     elev=float(elev[jj, ii]),
-                    ii_jj='{:02d}_{:02d}'.format(ii + 2, jj + 2),
+                    ii_jj=f'{ii + 2:02d}_{jj + 2:02d}',
                     geometry=Point(coords)
                 )
 

pygridtools/tests/__init__.py

@@ -1,6 +1,5 @@
 from importlib import resources
 
-import pygridtools
 from pygridgen.tests import requires
 
 try:

pygridtools/tests/conftest.py

@@ -10,7 +10,7 @@
 from pygridtools.iotools import _FocusProperties
 
 
-class FakeGrid(object):
+class FakeGrid:
     def __init__(self, boundary):
         self.x, self.y = simple_nodes()
         self.xn, self.yn = simple_nodes()

pygridtools/tests/test_core.py

@@ -1,7 +1,4 @@
-import os
-import warnings
 from pkg_resources import resource_filename
-import tempfile
 
 import numpy
 from numpy import nan
@@ -282,7 +279,7 @@ def polyverts():
 def test_ModelGrid_bad_shapes(simple_cells):
     xc, yc = simple_cells
     with raises(ValueError):
-        mg = core.ModelGrid(xc, yc[2:, 2:])
+        core.ModelGrid(xc, yc[2:, 2:])
 
 
 def test_ModelGrid_nodes_and_cells(g1, simple_cells):

pygridtools/tests/test_gefdc.py

@@ -4,12 +4,9 @@
 
 import numpy
 import pandas
-from shapely import geometry
-import geopandas
 
 import pytest
 import numpy.testing as nptest
-import pandas.testing as pdtest
 
 from pygridtools import gefdc
 from . import utils
@@ -52,7 +49,6 @@ def test_convert_gridext_to_gis(example_crs):
     gridextfile = resource_filename('pygridtools.tests.test_data', 'gridext.inp')
     baselinefile = resource_filename('pygridtools.tests.baseline_files', 'gridext.shp')
     river = 'test'
-    reach = 1
 
     with tempfile.TemporaryDirectory() as outputdir:
         outputfile = os.path.join(outputdir, 'gridext.shp')
@@ -90,7 +86,7 @@ def test_write_gridout_file(simple_nodes):
     with tempfile.TemporaryDirectory() as outdir:
         result_filename = os.path.join(outdir, 'testgrid.out')
 
-        df = gefdc.write_gridout_file(x, y, result_filename)
+        _ = gefdc.write_gridout_file(x, y, result_filename)
         utils.assert_textfiles_equal(known_filename, result_filename)
 
 

pygridtools/tests/test_iotools.py

@@ -1,7 +1,4 @@
-import os
-import sys
 from pkg_resources import resource_filename
-import tempfile
 
 import numpy
 import pandas
@@ -20,7 +17,6 @@
 from pygridtools import iotools
 import pygridgen
 from pygridgen.tests import raises, requires
-from . import utils
 
 
 @pytest.mark.parametrize(('filterfxn', 'points_in_boundary'), [
@@ -132,7 +128,7 @@ def test__change_focus(simple_grid):
     others = (iotools._FocusProperties(
         pos=old_pos, axis=old_axis, factor=old_factor, extent=old_extent),) * 3
 
-    xn = iotools._change_focus(fp, others, new_axis, new_pos,
+    _ = iotools._change_focus(fp, others, new_axis, new_pos,
         new_factor, new_extent, simple_grid, lambda x, y: x)
 
     # test single focus modification
@@ -166,7 +162,7 @@ def test_interactive_grid_focus_tabs(simple_grid, tab):
     (1, ipywidgets.widgets.widget_float.FloatSlider),
     (2, ipywidgets.widgets.widget_float.FloatLogSlider),
     (3, ipywidgets.widgets.widget_float.FloatSlider)])
-def test_interactive_grid_focus_tabs(simple_grid, parent, child, widget_type):
+def test_interactive_grid_focus_tabs2(simple_grid, parent, child, widget_type):
     focus_points, widget = iotools.interactive_grid_focus(simple_grid, n_points=2)
     assert isinstance(widget.children[parent], ipywidgets.widgets.interaction.interactive)
     assert isinstance(widget.children[parent].children[child], widget_type)

pygridtools/tests/test_misc.py

@@ -1,5 +1,7 @@
+import importlib.util
 from pathlib import Path
 from pkg_resources import resource_filename
+import importlib
 
 import numpy
 from numpy import nan
@@ -14,11 +16,7 @@
 
 numpy.set_printoptions(linewidth=150, nanstr='-')
 
-try:
-    import pygridgen
-    HASPGG = True
-except ImportError:
-    HASPGG = False
+HASPGG = bool(importlib.util.find_spec("pygridgen"))
 
 
 @pytest.mark.parametrize(('masked', 'z', 'triangles'), [
@@ -234,8 +232,8 @@ def stackgrids():
                 [nan, nan, nan, nan, 4.4, 4.5,  4.6,  4.7,  4.8, nan, nan, nan, nan, nan, nan, nan, nan],
                 [nan, nan, nan, nan, 5.4, 5.5,  5.6,  5.7,  5.8, nan, nan, nan, nan, nan, nan, nan, nan],
                 [nan, nan, nan, nan, nan, nan,  6.6,  6.7,  6.8, nan, nan, nan, nan, nan, nan, nan, nan],
-                [nan, nan, nan, nan, nan, nan,  7.6,  7.7,  7.8, 7.9, 7.10, 7.11, 7.12, 7.13, 7.14, 7.15, 7.16],
-                [nan, nan, nan, nan, nan, nan,  8.6,  8.7,  8.8, 8.9, 8.10, 8.11, 8.12, 8.13, 8.14, 8.15, 8.16],
+                [nan, nan, nan, nan, nan, nan,  7.6,  7.7,  7.8, 7.9, 7.10, 7.11, 7.12, 7.13, 7.14, 7.15, 7.16],  # noqa: E501
+                [nan, nan, nan, nan, nan, nan,  8.6,  8.7,  8.8, 8.9, 8.10, 8.11, 8.12, 8.13, 8.14, 8.15, 8.16],  # noqa: E501
                 [nan, nan, nan, nan, nan, nan,  9.6,  9.7,  9.8, 9.9, 9.10, 9.11, 9.12, 9.13, nan, nan, nan],
                 [nan, nan, nan, nan, nan, nan, 10.6, 10.7, 10.8, nan, nan, nan, nan, nan, nan, nan, nan],
                 [nan, nan, nan, nan, nan, nan, 11.6, 11.7, 11.8, nan, nan, nan, nan, nan, nan, nan, nan],
@@ -388,7 +386,6 @@ def test_gdf_of_cells(usemasks, fname, simple_grid, example_crs):
         mask = None
 
     baselinedir = Path(resource_filename('pygridtools.tests', 'baseline_files'))
-    river = 'test'
     expected = geopandas.read_file(str(baselinedir / fname))
     result = misc.gdf_of_cells(simple_grid.x, simple_grid.y, mask, example_crs)
     utils.assert_gdfs_equal(expected.drop(columns=['river', 'reach']), result)