Skip to content

Commit b3f9247

Browse files
committed
re-run black again
1 parent 86f2e11 commit b3f9247

File tree

196 files changed

+800
-2702
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

196 files changed

+800
-2702
lines changed

src/compas/__init__.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -240,9 +240,7 @@ def get(filename):
240240
if os.path.exists(localpath):
241241
return localpath
242242
else:
243-
return "https://raw.githubusercontent.com/compas-dev/compas/main/src/compas/data/samples/{}".format(
244-
filename
245-
)
243+
return "https://raw.githubusercontent.com/compas-dev/compas/main/src/compas/data/samples/{}".format(filename)
246244

247245

248246
def get_bunny(localstorage=None):
@@ -288,14 +286,10 @@ def get_bunny(localstorage=None):
288286
os.makedirs(localstorage)
289287

290288
if not os.path.isdir(localstorage):
291-
raise Exception(
292-
"Local storage location does not exist: {}".format(localstorage)
293-
)
289+
raise Exception("Local storage location does not exist: {}".format(localstorage))
294290

295291
if not os.access(localstorage, os.W_OK):
296-
raise Exception(
297-
"Local storage location is not writable: {}".format(localstorage)
298-
)
292+
raise Exception("Local storage location is not writable: {}".format(localstorage))
299293

300294
bunny = compas._os.absjoin(localstorage, "bunny/reconstruction/bun_zipper.ply")
301295
destination = compas._os.absjoin(localstorage, "bunny.tar.gz")

src/compas/__main__.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,7 @@
2323
print("Yay! COMPAS is installed correctly!")
2424
print()
2525
print("COMPAS: {}".format(compas.__version__))
26-
print(
27-
"Python: {} ({})".format(
28-
platform.python_version(), platform.python_implementation()
29-
)
30-
)
26+
print("Python: {} ({})".format(platform.python_version(), platform.python_implementation()))
3127

3228
if pkg_resources:
3329
working_set = pkg_resources.working_set

src/compas/_os.py

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -194,9 +194,7 @@ def select_python(python_executable):
194194
either `python` or `pythonw`.
195195
"""
196196
if PYTHON_DIRECTORY and os.path.exists(PYTHON_DIRECTORY):
197-
python_executables = (
198-
[python_executable] if python_executable else ["pythonw", "python"]
199-
)
197+
python_executables = [python_executable] if python_executable else ["pythonw", "python"]
200198

201199
for python_exe in python_executables:
202200
python = os.path.join(PYTHON_DIRECTORY, python_exe)
@@ -284,9 +282,7 @@ def _realpath_ipy_win(path):
284282
parent_path = os.path.join(path, "..")
285283

286284
args = 'dir /c "{}" /Al'.format(parent_path)
287-
process = subprocess.Popen(
288-
args, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE
289-
)
285+
process = subprocess.Popen(args, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
290286

291287
output, _error = process.communicate()
292288
matches = SYMLINK_REGEX.finditer(output)
@@ -302,9 +298,7 @@ def _realpath_ipy_win(path):
302298

303299
def _realpath_ipy_posix(path):
304300
args = 'readlink -f "{}"'.format(path)
305-
process = subprocess.Popen(
306-
args, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE
307-
)
301+
process = subprocess.Popen(args, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
308302
output, _error = process.communicate()
309303
return output
310304

@@ -323,14 +317,8 @@ def _polyfill_symlinks(symlinks, raise_on_error):
323317
mklink_cmd.write("ECHO ret=%symlink_result%\n")
324318
for i, (source, link_name) in enumerate(symlinks):
325319
dir_symlink_arg = "/D" if os.path.isdir(source) else ""
326-
mklink_cmd.write(
327-
"mklink {} {}\n".format(
328-
dir_symlink_arg, subprocess.list2cmdline([link_name, source])
329-
)
330-
)
331-
mklink_cmd.write(
332-
"IF %ERRORLEVEL% EQU 0 SET /A symlink_result += {} \n".format(2**i)
333-
)
320+
mklink_cmd.write("mklink {} {}\n".format(dir_symlink_arg, subprocess.list2cmdline([link_name, source])))
321+
mklink_cmd.write("IF %ERRORLEVEL% EQU 0 SET /A symlink_result += {} \n".format(2**i))
334322

335323
mklink_cmd.write("EXIT /B %symlink_result%\n")
336324

@@ -547,9 +535,7 @@ def _run_command_as_admin(command, arguments):
547535

548536
with open(temp_path, "w") as remove_symlink_cmd:
549537
remove_symlink_cmd.write("@echo off\n")
550-
remove_symlink_cmd.write(
551-
"{} {}\n".format(command, subprocess.list2cmdline(arguments))
552-
)
538+
remove_symlink_cmd.write("{} {}\n".format(command, subprocess.list2cmdline(arguments)))
553539

554540
_run_as_admin([temp_path])
555541

@@ -588,10 +574,7 @@ def _run_as_admin(command):
588574
ctypes.windll.kernel32.WaitForSingleObject(process_handle, INFINITE)
589575

590576
ret = ctypes.wintypes.DWORD()
591-
if (
592-
ctypes.windll.kernel32.GetExitCodeProcess(process_handle, ctypes.byref(ret))
593-
== 0
594-
):
577+
if ctypes.windll.kernel32.GetExitCodeProcess(process_handle, ctypes.byref(ret)) == 0:
595578
raise RuntimeError("Failed to retrieve exit code")
596579

597580
return ret.value

src/compas/artists/artist.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,7 @@ def _get_artist_cls(data, **kwargs):
6464

6565
if cls is None:
6666
raise DataArtistNotRegistered(
67-
"No artist is registered for this data type: {} in this context: {}".format(
68-
dtype, Artist.CONTEXT
69-
)
67+
"No artist is registered for this data type: {} in this context: {}".format(dtype, Artist.CONTEXT)
7068
)
7169

7270
return cls

src/compas/artists/exceptions.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,7 @@ class NoArtistContextError(Exception):
1212

1313
def __init__(self):
1414
error_message = "No context defined."
15-
error_message += (
16-
"\n\nThis usually means that the script that you are running requires"
17-
)
18-
error_message += (
19-
"\na CAD environment but it is being ran as a standalone script"
20-
)
15+
error_message += "\n\nThis usually means that the script that you are running requires"
16+
error_message += "\na CAD environment but it is being ran as a standalone script"
2117
error_message += "\n(ie. from the command line or code editor)."
2218
super(NoArtistContextError, self).__init__(error_message)

src/compas/artists/meshartist.py

Lines changed: 9 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -106,15 +106,7 @@ class MeshArtist(Artist):
106106
default_edgewidth = 1.0
107107

108108
def __init__(
109-
self,
110-
mesh,
111-
vertices=None,
112-
edges=None,
113-
faces=None,
114-
vertexcolor=None,
115-
edgecolor=None,
116-
facecolor=None,
117-
**kwargs
109+
self, mesh, vertices=None, edges=None, faces=None, vertexcolor=None, edgecolor=None, facecolor=None, **kwargs
118110
):
119111
super(MeshArtist, self).__init__()
120112

@@ -197,10 +189,7 @@ def faces(self, faces):
197189
@property
198190
def vertex_xyz(self):
199191
if self._vertex_xyz is None:
200-
return {
201-
vertex: self.mesh.vertex_attributes(vertex, "xyz")
202-
for vertex in self.mesh.vertices()
203-
}
192+
return {vertex: self.mesh.vertex_attributes(vertex, "xyz") for vertex in self.mesh.vertices()}
204193
return self._vertex_xyz
205194

206195
@vertex_xyz.setter
@@ -218,18 +207,14 @@ def vertex_text(self, text):
218207
if text == "key":
219208
self._vertex_text = {vertex: str(vertex) for vertex in self.mesh.vertices()}
220209
elif text == "index":
221-
self._vertex_text = {
222-
vertex: str(index) for index, vertex in enumerate(self.mesh.vertices())
223-
}
210+
self._vertex_text = {vertex: str(index) for index, vertex in enumerate(self.mesh.vertices())}
224211
elif isinstance(text, dict):
225212
self._vertex_text = text
226213

227214
@property
228215
def vertex_size(self):
229216
if not self._vertex_size:
230-
self._vertex_size = {
231-
vertex: self.default_vertexsize for vertex in self.mesh.vertices()
232-
}
217+
self._vertex_size = {vertex: self.default_vertexsize for vertex in self.mesh.vertices()}
233218
return self._vertex_size
234219

235220
@vertex_size.setter
@@ -242,30 +227,22 @@ def vertex_size(self, vertexsize):
242227
@property
243228
def edge_text(self):
244229
if self._edge_text is None:
245-
self._edge_text = {
246-
edge: "{}-{}".format(*edge) for edge in self.mesh.edges()
247-
}
230+
self._edge_text = {edge: "{}-{}".format(*edge) for edge in self.mesh.edges()}
248231
return self._edge_text
249232

250233
@edge_text.setter
251234
def edge_text(self, text):
252235
if text == "key":
253-
self._edge_text = {
254-
edge: "{}-{}".format(*edge) for edge in self.mesh.edges()
255-
}
236+
self._edge_text = {edge: "{}-{}".format(*edge) for edge in self.mesh.edges()}
256237
elif text == "index":
257-
self._edge_text = {
258-
edge: str(index) for index, edge in enumerate(self.mesh.edges())
259-
}
238+
self._edge_text = {edge: str(index) for index, edge in enumerate(self.mesh.edges())}
260239
elif isinstance(text, dict):
261240
self._edge_text = text
262241

263242
@property
264243
def edge_width(self):
265244
if not self._edge_width:
266-
self._edge_width = {
267-
edge: self.default_edgewidth for edge in self.mesh.edges()
268-
}
245+
self._edge_width = {edge: self.default_edgewidth for edge in self.mesh.edges()}
269246
return self._edge_width
270247

271248
@edge_width.setter
@@ -286,9 +263,7 @@ def face_text(self, text):
286263
if text == "key":
287264
self._face_text = {face: str(face) for face in self.mesh.faces()}
288265
elif text == "index":
289-
self._face_text = {
290-
face: str(index) for index, face in enumerate(self.mesh.faces())
291-
}
266+
self._face_text = {face: str(index) for index, face in enumerate(self.mesh.faces())}
292267
elif isinstance(text, dict):
293268
self._face_text = text
294269

src/compas/artists/networkartist.py

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,7 @@ class NetworkArtist(Artist):
7979
default_nodesize = 5
8080
default_edgewidth = 1.0
8181

82-
def __init__(
83-
self, network, nodes=None, edges=None, nodecolor=None, edgecolor=None, **kwargs
84-
):
82+
def __init__(self, network, nodes=None, edges=None, nodecolor=None, edgecolor=None, **kwargs):
8583
super(NetworkArtist, self).__init__()
8684

8785
self._default_nodecolor = None
@@ -141,10 +139,7 @@ def edges(self, edges):
141139
@property
142140
def node_xyz(self):
143141
if not self._node_xyz:
144-
return {
145-
node: self.network.node_attributes(node, "xyz")
146-
for node in self.network.nodes()
147-
}
142+
return {node: self.network.node_attributes(node, "xyz") for node in self.network.nodes()}
148143
return self._node_xyz
149144

150145
@node_xyz.setter
@@ -154,9 +149,7 @@ def node_xyz(self, node_xyz):
154149
@property
155150
def node_size(self):
156151
if not self._node_size:
157-
self._node_size = {
158-
node: self.default_nodesize for node in self.network.nodes()
159-
}
152+
self._node_size = {node: self.default_nodesize for node in self.network.nodes()}
160153
return self._node_size
161154

162155
@node_size.setter
@@ -177,39 +170,29 @@ def node_text(self, text):
177170
if text == "key":
178171
self._node_text = {node: str(node) for node in self.network.nodes()}
179172
elif text == "index":
180-
self._node_text = {
181-
node: str(index) for index, node in enumerate(self.network.nodes())
182-
}
173+
self._node_text = {node: str(index) for index, node in enumerate(self.network.nodes())}
183174
elif isinstance(text, dict):
184175
self._node_text = text
185176

186177
@property
187178
def edge_text(self):
188179
if not self._edge_text:
189-
self._edge_text = {
190-
edge: "{}-{}".format(*edge) for edge in self.network.edges()
191-
}
180+
self._edge_text = {edge: "{}-{}".format(*edge) for edge in self.network.edges()}
192181
return self._edge_text
193182

194183
@edge_text.setter
195184
def edge_text(self, text):
196185
if text == "key":
197-
self._edge_text = {
198-
edge: "{}-{}".format(*edge) for edge in self.network.edges()
199-
}
186+
self._edge_text = {edge: "{}-{}".format(*edge) for edge in self.network.edges()}
200187
elif text == "index":
201-
self._edge_text = {
202-
edge: str(index) for index, edge in enumerate(self.network.edges())
203-
}
188+
self._edge_text = {edge: str(index) for index, edge in enumerate(self.network.edges())}
204189
elif isinstance(text, dict):
205190
self._edge_text = text
206191

207192
@property
208193
def edge_width(self):
209194
if not self._edge_width:
210-
self._edge_width = {
211-
edge: self.default_edgewidth for edge in self.network.edges()
212-
}
195+
self._edge_width = {edge: self.default_edgewidth for edge in self.network.edges()}
213196
return self._edge_width
214197

215198
@edge_width.setter

0 commit comments

Comments
 (0)