Skip to content

Commit b0bccf5

Browse files
committed
bug fix; pylint and flake8 fixes
1 parent 69e9b6a commit b0bccf5

22 files changed

+354
-300
lines changed

.pylintrc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
[MESSAGES CONTROL]
2-
disable=invalid-name, bad-continuation, too-many-lines, superfluous-parens, too-many-arguments, too-many-branches, too-many-statements, too-many-locals
2+
disable=invalid-name,bad-continuation,too-many-lines,superfluous-parens,too-many-arguments,too-many-branches,too-many-statements,too-many-locals,too-few-public-methods,too-many-instance-attributes
3+
[TYPECHECK]
4+
ignored-modules=numpy,netCDF4,scipy,scipy.spatial

RAPIDpy/__init__.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
# -*- coding: utf-8 -*-
2-
from .rapid import RAPID
3-
from .dataset import RAPIDDataset
2+
"""
3+
RAPIDpy
4+
5+
Created by Alan D Snow, 2015.
6+
License: BSD 3-Clause
7+
"""
8+
from .rapid import RAPID # noqa
9+
from .dataset import RAPIDDataset # noqa

RAPIDpy/dataset.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from csv import writer as csv_writer
1010
import datetime
1111

12-
from netCDF4 import Dataset, num2date # pylint: disable=no-name-in-module
12+
from netCDF4 import Dataset, num2date
1313
import numpy as np
1414
from numpy.ma import is_masked
1515
import pandas as pd

RAPIDpy/gis/muskingum.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ def CreateMuskingumKfacFile(in_drainage_line,
117117

118118
number_of_features = ogr_drainage_line_shapefile_lyr.GetFeatureCount()
119119
river_id_list = np.zeros(number_of_features, dtype=np.int32)
120-
# pylint: disable=no-member
120+
121121
length_list = \
122122
np.zeros(number_of_features, dtype=np.float32)
123123
slope_list = np.zeros(number_of_features, dtype=np.float32)

RAPIDpy/gis/voronoi.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
import numpy as np
1212
from osgeo import ogr, osr
13-
from scipy.spatial import Voronoi # pylint: disable=no-name-in-module
13+
from scipy.spatial import Voronoi
1414
from shapely.geometry import Polygon
1515

1616
from ..helper_functions import log

RAPIDpy/gis/weight.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from datetime import datetime
1212
from functools import partial
1313

14-
from netCDF4 import Dataset # pylint: disable=no-name-in-module
14+
from netCDF4 import Dataset
1515
import numpy as np
1616
from pyproj import Proj, transform
1717
from shapely.wkb import loads as shapely_loads

RAPIDpy/helper_functions.py

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
from numpy.testing import assert_almost_equal
1313
from numpy import array as np_array
14-
from numpy import float32 as np_float32 # pylint: disable=no-name-in-module
14+
from numpy import float32 as np_float32
1515

1616

1717
# -----------------------------------------------------------------------------
@@ -121,3 +121,16 @@ def remove_files(*args):
121121
remove(arg)
122122
except OSError:
123123
pass
124+
125+
126+
def add_latlon_metadata(lat_var, lon_var):
127+
"""Adds latitude and longitude metadata"""
128+
lat_var.long_name = 'latitude'
129+
lat_var.standard_name = 'latitude'
130+
lat_var.units = 'degrees_north'
131+
lat_var.axis = 'Y'
132+
133+
lon_var.long_name = 'longitude'
134+
lon_var.standard_name = 'longitude'
135+
lon_var.units = 'degrees_east'
136+
lon_var.axis = 'X'

RAPIDpy/inflow/CreateInflowFileFromERAInterimRunoff.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Adapted from CreateInflowFileFromECMWFRunoff.py.
88
License: BSD-3-Clause
99
"""
10-
from netCDF4 import Dataset # pylint: disable=no-name-in-module
10+
from netCDF4 import Dataset
1111

1212
from .CreateInflowFileFromGriddedRunoff import \
1313
CreateInflowFileFromGriddedRunoff

RAPIDpy/inflow/CreateInflowFileFromGriddedRunoff.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@
66
Created by Alan D. Snow, 2016
77
License: BSD-3-Clause
88
"""
9-
# pylint: disable=no-member
109
from abc import abstractmethod
1110
import csv
1211
from datetime import datetime
1312
import os
1413

15-
from netCDF4 import Dataset # pylint: disable=no-name-in-module
14+
from netCDF4 import Dataset
1615
import numpy as np
1716
from pytz import utc
1817
from past.builtins import xrange # pylint: disable=redefined-builtin
@@ -32,6 +31,7 @@ class CreateInflowFileFromGriddedRunoff(object):
3231
header_wt = ['rivid', 'area_sqm', 'lon_index', 'lat_index', 'npoints']
3332

3433
def __init__(self):
34+
self.runoff_vars = []
3535
self.dict_list = []
3636
self.count = 0
3737
self.size_stream_id = 0

RAPIDpy/inflow/CreateInflowFileFromLDASRunoff.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Adapted from CreateInflowFileFromECMWFRunoff.py.
88
License: BSD-3-Clause
99
"""
10-
from netCDF4 import Dataset # pylint: disable=no-name-in-module
10+
from netCDF4 import Dataset
1111

1212
from .CreateInflowFileFromGriddedRunoff import \
1313
CreateInflowFileFromGriddedRunoff

0 commit comments

Comments
 (0)