Skip to content

Commit 35de892

Browse files
thodson-usgsthodson-usgs
authored
Lint and format (#164)
* Lint and format
1 parent 9f09525 commit 35de892

17 files changed

Lines changed: 1147 additions & 973 deletions

‎dataretrieval/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
from dataretrieval.wqp import *
99

1010
try:
11-
__version__ = version('dataretrieval')
11+
__version__ = version("dataretrieval")
1212
except PackageNotFoundError:
13-
__version__ = 'version-unknown'
13+
__version__ = "version-unknown"

‎dataretrieval/codes/states.py‎

Lines changed: 101 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -1,108 +1,109 @@
11
"""List of 2-digit state codes with commented full names."""
2+
23
state_codes = {
3-
"Alabama": "al",
4-
"Alaska": "ak",
5-
"Arizona": "az",
6-
"Arkansas": "ar",
7-
"California": "ca",
8-
"Colorado": "co",
9-
"Connecticut": "ct",
10-
"Delaware": "de",
4+
"Alabama": "al",
5+
"Alaska": "ak",
6+
"Arizona": "az",
7+
"Arkansas": "ar",
8+
"California": "ca",
9+
"Colorado": "co",
10+
"Connecticut": "ct",
11+
"Delaware": "de",
1112
"District of Columbia": "dc",
12-
"Florida": "fl",
13-
"Georgia": "ga",
14-
"Hawaii": "hi",
15-
"Idaho": "id",
16-
"Illinois": "il",
17-
"Indiana": "in",
18-
"Iowa": "ia",
19-
"Kansas": "ks",
20-
"Kentucky": "ky",
21-
"Louisiana": "la",
22-
"Maine": "me",
23-
"Maryland": "md",
24-
"Massachusetts": "ma",
25-
"Michigan": "mi",
26-
"Minnesota": "mn",
27-
"Mississippi": "ms",
28-
"Missouri": "mo",
29-
"Montana": "mt",
30-
"Nebraska": "ne",
31-
"Nevada": "nv",
32-
"New Hampshire": "nh",
33-
"New Jersey": "nj",
34-
"New Mexico": "nm",
35-
"New York": "ny",
36-
"North Carolina": "nc",
37-
"North Dakota": "nd",
38-
"Ohio": "oh",
39-
"Oklahoma": "ok",
40-
"Oregon": "or",
41-
"Pennsylvania": "pa",
42-
"Rhode Island": "ri",
43-
"South Carolina": "sc",
44-
"South Dakota": "sd",
45-
"Tennessee": "tn",
46-
"Texas": "tx",
47-
"Utah": "ut",
48-
"Vermont": "vt",
49-
"Virginia": "va",
50-
"Washington": "wa",
51-
"West Virginia": "wv",
52-
"Wisconsin": "wi",
53-
"Wyoming": "wy",
13+
"Florida": "fl",
14+
"Georgia": "ga",
15+
"Hawaii": "hi",
16+
"Idaho": "id",
17+
"Illinois": "il",
18+
"Indiana": "in",
19+
"Iowa": "ia",
20+
"Kansas": "ks",
21+
"Kentucky": "ky",
22+
"Louisiana": "la",
23+
"Maine": "me",
24+
"Maryland": "md",
25+
"Massachusetts": "ma",
26+
"Michigan": "mi",
27+
"Minnesota": "mn",
28+
"Mississippi": "ms",
29+
"Missouri": "mo",
30+
"Montana": "mt",
31+
"Nebraska": "ne",
32+
"Nevada": "nv",
33+
"New Hampshire": "nh",
34+
"New Jersey": "nj",
35+
"New Mexico": "nm",
36+
"New York": "ny",
37+
"North Carolina": "nc",
38+
"North Dakota": "nd",
39+
"Ohio": "oh",
40+
"Oklahoma": "ok",
41+
"Oregon": "or",
42+
"Pennsylvania": "pa",
43+
"Rhode Island": "ri",
44+
"South Carolina": "sc",
45+
"South Dakota": "sd",
46+
"Tennessee": "tn",
47+
"Texas": "tx",
48+
"Utah": "ut",
49+
"Vermont": "vt",
50+
"Virginia": "va",
51+
"Washington": "wa",
52+
"West Virginia": "wv",
53+
"Wisconsin": "wi",
54+
"Wyoming": "wy",
5455
}
5556

5657
fips_codes = {
57-
"Alabama": "01",
58-
"Alaska": "02",
59-
"Arizona": "04",
60-
"Arkansas": "05",
61-
"California": "06",
62-
"Colorado": "08",
63-
"Connecticut": "09",
64-
"Delaware": "10",
58+
"Alabama": "01",
59+
"Alaska": "02",
60+
"Arizona": "04",
61+
"Arkansas": "05",
62+
"California": "06",
63+
"Colorado": "08",
64+
"Connecticut": "09",
65+
"Delaware": "10",
6566
"District of Columbia": "11",
66-
"Florida": "12",
67-
"Georgia": "13",
68-
"Hawaii": "15",
69-
"Idaho": "16",
70-
"Illinois": "17",
71-
"Indiana": "18",
72-
"Iowa": "19",
73-
"Kansas": "20",
74-
"Kentucky": "21",
75-
"Louisiana": "22",
76-
"Maine": "23",
77-
"Maryland": "24",
78-
"Massachusetts": "25",
79-
"Michigan": "26",
80-
"Minnesota": "27",
81-
"Mississippi": "28",
82-
"Missouri": "29",
83-
"Montana": "30",
84-
"Nebraska": "31",
85-
"Nevada": "32",
86-
"New Hampshire": "33",
87-
"New Jersey": "34",
88-
"New Mexico": "35",
89-
"New York": "36",
90-
"North Carolina": "37",
91-
"North Dakota": "38",
92-
"Ohio": "39",
93-
"Oklahoma": "40",
94-
"Oregon": "41",
95-
"Pennsylvania": "42",
96-
"Rhode Island": "44",
97-
"South Carolina": "45",
98-
"South Dakota": "46",
99-
"Tennessee": "47",
100-
"Texas": "48",
101-
"Utah": "49",
102-
"Vermont": "50",
103-
"Virginia": "51",
104-
"Washington": "53",
105-
"West Virginia": "54",
106-
"Wisconsin": "55",
107-
"Wyoming": "56",
67+
"Florida": "12",
68+
"Georgia": "13",
69+
"Hawaii": "15",
70+
"Idaho": "16",
71+
"Illinois": "17",
72+
"Indiana": "18",
73+
"Iowa": "19",
74+
"Kansas": "20",
75+
"Kentucky": "21",
76+
"Louisiana": "22",
77+
"Maine": "23",
78+
"Maryland": "24",
79+
"Massachusetts": "25",
80+
"Michigan": "26",
81+
"Minnesota": "27",
82+
"Mississippi": "28",
83+
"Missouri": "29",
84+
"Montana": "30",
85+
"Nebraska": "31",
86+
"Nevada": "32",
87+
"New Hampshire": "33",
88+
"New Jersey": "34",
89+
"New Mexico": "35",
90+
"New York": "36",
91+
"North Carolina": "37",
92+
"North Dakota": "38",
93+
"Ohio": "39",
94+
"Oklahoma": "40",
95+
"Oregon": "41",
96+
"Pennsylvania": "42",
97+
"Rhode Island": "44",
98+
"South Carolina": "45",
99+
"South Dakota": "46",
100+
"Tennessee": "47",
101+
"Texas": "48",
102+
"Utah": "49",
103+
"Vermont": "50",
104+
"Virginia": "51",
105+
"Washington": "53",
106+
"West Virginia": "54",
107+
"Wisconsin": "55",
108+
"Wyoming": "56",
108109
}

‎dataretrieval/codes/timezones.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Time zone information
33
"""
44

5-
tz_str = '''-1200 Y
5+
tz_str = """-1200 Y
66
-1100 X NUT SST
77
-1000 W CKT HAST HST TAHT TKT
88
-0900 V AKST GAMT GIT HADT HNY
@@ -39,10 +39,10 @@
3939
-0230 HAT NDT
4040
-0330 HNT NST NT
4141
-0430 HLV VET
42-
-0930 MART MIT'''
42+
-0930 MART MIT"""
4343

4444
tz = {}
45-
for tz_descr in map(str.split, tz_str.split('\n')):
45+
for tz_descr in map(str.split, tz_str.split("\n")):
4646
tz_offset = tz_descr[0]
4747
for tz_code in tz_descr[1:]:
4848
tz[tz_code] = tz_offset

‎dataretrieval/nadp.py‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -37,26 +37,26 @@
3737

3838
import requests
3939

40-
NADP_URL = 'https://nadp.slh.wisc.edu'
41-
NADP_MAP_EXT = 'filelib/maps'
40+
NADP_URL = "https://nadp.slh.wisc.edu"
41+
NADP_MAP_EXT = "filelib/maps"
4242

43-
NTN_CONC_PARAMS = ['pH', 'So4', 'NO3', 'NH4', 'Ca', 'Mg', 'K', 'Na', 'Cl', 'Br']
43+
NTN_CONC_PARAMS = ["pH", "So4", "NO3", "NH4", "Ca", "Mg", "K", "Na", "Cl", "Br"]
4444
NTN_DEP_PARAMS = [
45-
'H',
46-
'So4',
47-
'NO3',
48-
'NH4',
49-
'Ca',
50-
'Mg',
51-
'K',
52-
'Na',
53-
'Cl',
54-
'Br',
55-
'N',
56-
'SPlusN',
45+
"H",
46+
"So4",
47+
"NO3",
48+
"NH4",
49+
"Ca",
50+
"Mg",
51+
"K",
52+
"Na",
53+
"Cl",
54+
"Br",
55+
"N",
56+
"SPlusN",
5757
]
5858

59-
NTN_MEAS_TYPE = ['conc', 'dep', 'precip'] # concentration or deposition
59+
NTN_MEAS_TYPE = ["conc", "dep", "precip"] # concentration or deposition
6060

6161

6262
class NADP_ZipFile(zipfile.ZipFile):
@@ -65,7 +65,7 @@ class NADP_ZipFile(zipfile.ZipFile):
6565
def tif_name(self):
6666
"""Get the name of the tif file in the zip file."""
6767
filenames = self.namelist()
68-
r = re.compile('.*tif$')
68+
r = re.compile(".*tif$")
6969
tif_list = list(filter(r.match, filenames))
7070
return tif_list[0]
7171

@@ -105,23 +105,23 @@ def get_annual_MDN_map(measurement_type, year, path):
105105
106106
>>> # get map of mercury concentration in 2010 and extract it to a path
107107
>>> data_path = dataretrieval.nadp.get_annual_MDN_map(
108-
... measurement_type='conc', year='2010', path='somepath'
108+
... measurement_type="conc", year="2010", path="somepath"
109109
... )
110110
111111
"""
112-
url = f'{NADP_URL}/{NADP_MAP_EXT}/MDN/grids/'
112+
url = f"{NADP_URL}/{NADP_MAP_EXT}/MDN/grids/"
113113

114-
filename = f'Hg_{measurement_type}_{year}.zip'
114+
filename = f"Hg_{measurement_type}_{year}.zip"
115115

116116
z = get_zip(url, filename)
117117

118118
if path:
119119
z.extractall(path)
120120

121-
return f'{path}{os.sep}{basename(filename)}'
121+
return f"{path}{os.sep}{basename(filename)}"
122122

123123

124-
def get_annual_NTN_map(measurement_type, measurement=None, year=None, path='.'):
124+
def get_annual_NTN_map(measurement_type, measurement=None, year=None, path="."):
125125
"""Download a NTN map from NDAP.
126126
127127
This function looks for a zip file containing gridded information at:
@@ -158,23 +158,23 @@ def get_annual_NTN_map(measurement_type, measurement=None, year=None, path='.'):
158158
159159
>>> # get a map of precipitation in 2015 and extract it to a path
160160
>>> data_path = dataretrieval.nadp.get_annual_NTN_map(
161-
... measurement_type='Precip', year='2015', path='somepath'
161+
... measurement_type="Precip", year="2015", path="somepath"
162162
... )
163163
164164
"""
165-
url = f'{NADP_URL}/{NADP_MAP_EXT}/NTN/grids/{year}/'
165+
url = f"{NADP_URL}/{NADP_MAP_EXT}/NTN/grids/{year}/"
166166

167-
filename = f'{measurement_type}_{year}.zip'
167+
filename = f"{measurement_type}_{year}.zip"
168168

169169
if measurement:
170-
filename = f'{measurement}_{filename}'
170+
filename = f"{measurement}_{filename}"
171171

172172
z = get_zip(url, filename)
173173

174174
if path:
175175
z.extractall(path)
176176

177-
return f'{path}{os.sep}{basename(filename)}'
177+
return f"{path}{os.sep}{basename(filename)}"
178178

179179

180180
def get_zip(url, filename):

0 commit comments

Comments
 (0)