Skip to content

Commit 2a33aae

Browse files
committed
black 79
1 parent 242ecfe commit 2a33aae

2 files changed

Lines changed: 21 additions & 7 deletions

File tree

src/actinia/job.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,9 @@ def poll_until_finished(self, waiting_time=5, quiet=False):
114114
def terminate(self):
115115
"""Terminate the current job"""
116116
kwargs = {"auth": self._Job__auth, "timeout": self.__actinia.timeout}
117-
url = f"{self._Job__actinia.url}/resources/{self.user_id}/{self.resource_id}"
117+
url = (
118+
f"{self._Job__actinia.url}/resources/"
119+
f"{self.user_id}/{self.resource_id}"
120+
)
118121
request_and_check("DELETE", url, **kwargs)
119122
log.info("Termination request for job {self.resource_id} committed.")

src/actinia/mapset.py

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,8 @@ def list_mapsets_request(cls, location_name, actinia, auth):
154154
"GET", url, **{"auth": auth, "timeout": actinia.timeout}
155155
)["process_results"]
156156
mapsets = {
157-
mname: Mapset(mname, location_name, actinia, auth) for mname in mapset_names
157+
mname: Mapset(mname, location_name, actinia, auth)
158+
for mname in mapset_names
158159
}
159160
return mapsets
160161

@@ -186,13 +187,17 @@ def create_mapset_request(cls, mapset_name, location_name, actinia, auth):
186187
and text if request fails.
187188
"""
188189
# check if mapset exists
189-
existing_mapsets = cls.list_mapsets_request(location_name, actinia, auth)
190+
existing_mapsets = cls.list_mapsets_request(
191+
location_name, actinia, auth
192+
)
190193
if mapset_name in existing_mapsets:
191194
log.warning(f"Mapset <{mapset_name}> already exists.")
192195
return existing_mapsets[mapset_name]
193196

194197
url = cls.__request_url(actinia.url, location_name, mapset_name)
195-
request_and_check("POST", url, **{"auth": (auth), "timeout": actinia.timeout})
198+
request_and_check(
199+
"POST", url, **{"auth": (auth), "timeout": actinia.timeout}
200+
)
196201
return Mapset(mapset_name, location_name, actinia, auth)
197202

198203
@classmethod
@@ -222,13 +227,19 @@ def delete_mapset_request(cls, mapset_name, location_name, actinia, auth):
222227
and text if request fails.
223228
"""
224229
# check if mapset exists
225-
existing_mapsets = cls.list_mapsets_request(location_name, actinia, auth)
230+
existing_mapsets = cls.list_mapsets_request(
231+
location_name, actinia, auth
232+
)
226233
if mapset_name not in existing_mapsets:
227-
log.warning(f"Mapset <{mapset_name}> does not exist and cannot be deleted.")
234+
log.warning(
235+
f"Mapset <{mapset_name}> does not exist and cannot be deleted."
236+
)
228237
return None
229238

230239
url = cls.__request_url(actinia.url, location_name, mapset_name)
231-
request_and_check("DELETE", url, **{"auth": (auth), "timeout": actinia.timeout})
240+
request_and_check(
241+
"DELETE", url, **{"auth": (auth), "timeout": actinia.timeout}
242+
)
232243
return None
233244

234245
@classmethod

0 commit comments

Comments
 (0)