Skip to content

Commit 880646c

Browse files
committed
lint
1 parent ff35e6e commit 880646c

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

pvlib/iotools/merra2.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
'TOTEXTTAU': 'aod550',
1414
}
1515

16+
1617
def get_merra2(latitude, longitude, start, end, username, password, dataset,
1718
variables, map_variables=True):
1819
"""
@@ -132,7 +133,7 @@ def _to_utc_dt_notz(dt):
132133

133134
# drop the non-data columns
134135
dropcols = ['time', 'station', 'latitude[unit="degrees_north"]',
135-
'longitude[unit="degrees_east"]']
136+
'longitude[unit="degrees_east"]']
136137
df = df.drop(columns=dropcols)
137138

138139
# column names are like T2M[unit="K"] by default. extract the unit

tests/iotools/test_merra2.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@ def params():
1414
earthdata_username = os.environ["EARTHDATA_USERNAME"]
1515
earthdata_password = os.environ["EARTHDATA_PASSWORD"]
1616

17-
return {'latitude': 40.01, 'longitude': -80.01,
18-
'start': '2020-06-01 15:00', 'end': '2020-06-01 20:00',
19-
'dataset': 'M2T1NXRAD.5.12.4', 'variables': ['ALBEDO', 'SWGDN'],
20-
'username': earthdata_username, 'password': earthdata_password,
17+
return {
18+
'latitude': 40.01, 'longitude': -80.01,
19+
'start': '2020-06-01 15:00', 'end': '2020-06-01 20:00',
20+
'dataset': 'M2T1NXRAD.5.12.4', 'variables': ['ALBEDO', 'SWGDN'],
21+
'username': earthdata_username, 'password': earthdata_password,
2122
}
2223

2324

@@ -29,7 +30,7 @@ def expected():
2930
albedo = [0.163931, 0.1609407, 0.1601474, 0.1612476, 0.164664, 0.1711341]
3031
ghi = [ 930., 1002.75, 1020.25, 981.25, 886.5, 743.5]
3132
df = pd.DataFrame({'albedo': albedo, 'ghi': ghi}, index=index)
32-
return df
33+
return df
3334

3435

3536
@pytest.fixture

0 commit comments

Comments
 (0)