Skip to content

Commit f9699cd

Browse files
committed
Avoid line-too-long linting errors
I ignored some, since I don't think splitting the URLs makes them any clearer. Happy to revert.
1 parent b445e5d commit f9699cd

File tree

2 files changed

+19
-14
lines changed

2 files changed

+19
-14
lines changed

src/labels/cli.py

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,8 @@ def sync_cmd(
188188
if local_label.params_dict == remote_label.params_dict:
189189
labels_to_ignore[remote_name] = local_label
190190
else:
191-
if (remote_name != local_label.name) and (local_label.name in remote_labels):
191+
if ((remote_name != local_label.name)
192+
and (local_label.name in remote_labels)):
192193
# There is already a label with this name
193194
labels_to_merge[remote_name] = local_label.name
194195
else:
@@ -217,7 +218,11 @@ def sync_cmd(
217218
if dryrun:
218219
# Do not modify remote labels, but only print info
219220
dryrun_echo(
220-
labels_to_merge, labels_to_update, labels_to_delete, labels_to_create, labels_to_ignore
221+
labels_to_merge,
222+
labels_to_update,
223+
labels_to_delete,
224+
labels_to_create,
225+
labels_to_ignore
221226
)
222227
# sys.exit(0)
223228
return
@@ -227,7 +232,8 @@ def sync_cmd(
227232
# Merge has to occur before update and delete
228233
for old_label, new_label in labels_to_merge.items():
229234
try:
230-
context.client.merge_label(repository, old_label=old_label, new_label=new_label)
235+
context.client.merge_label(
236+
repository, old_label=old_label, new_label=new_label)
231237
except LabelsException as exc:
232238
click.echo(str(exc), err=True)
233239
failures.append(old_label)
@@ -278,7 +284,8 @@ def dryrun_echo(
278284
if labels_to_merge:
279285
click.echo(f"This would merge the following labels:")
280286
for name in labels_to_merge:
281-
click.echo(f" - {', '.join([' to '.join((old, new)) for old, new in labels_to_merge.items()])}")
287+
click.echo(f"""\
288+
- {', '.join([' to '.join((old, new)) for old, new in labels_to_merge.items()])}""")
282289

283290
if labels_to_update:
284291
click.echo(f"This would update the following labels:")

src/labels/github.py

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -177,16 +177,16 @@ def merge_label(self, repo: Repository, *, old_label: str, new_label: str) -> No
177177
- The old label will be deleted while processing labels to delete.
178178
"""
179179
logger = logging.getLogger("labels")
180-
logger.debug(f"Requesting issues for label {old_label} in {repo.owner}/{repo.name}")
180+
logger.debug(f"Requesting issues for label {old_label} in {repo.owner}/{repo.name}") # noqa: E501
181181

182182
response = self.session.get(
183-
f"{self.base_url}/search/issues?q=label:{old_label}+repo:{repo.owner}/{repo.name}",
183+
f"{self.base_url}/search/issues?q=label:{old_label}+repo:{repo.owner}/{repo.name}", # noqa: E501
184184
headers={"Accept": "application/vnd.github.symmetra-preview+json"},
185185
)
186186

187187
if response.status_code != 200:
188188
raise GitHubException(
189-
f"Error retrieving issues for label {old_label} in {repo.owner}/{repo.name}: "
189+
f"Error retrieving issues for label {old_label} in {repo.owner}/{repo.name}: " # noqa: E501
190190
f"{response.status_code} - "
191191
f"{response.reason}"
192192
)
@@ -213,34 +213,32 @@ def merge_label(self, repo: Repository, *, old_label: str, new_label: str) -> No
213213

214214
for issue in json['items']:
215215
response = self.session.get(
216-
f"{self.base_url}/repos/{repo.owner}/{repo.name}/issues/{issue['number']}/labels",
216+
f"{self.base_url}/repos/{repo.owner}/{repo.name}/issues/{issue['number']}/labels", # noqa: E501
217217
headers={"Accept": "application/vnd.github.symmetra-preview+json"},
218218
)
219219

220220
if response.status_code != 200:
221221
raise GitHubException(
222-
f"Error retrieving labels for {repo.owner}/{repo.name}/issue/{issue['number']}: "
222+
f"Error retrieving labels for {repo.owner}/{repo.name}/issue/{issue['number']}: " # noqa: E501
223223
f"{response.status_code} - "
224224
f"{response.reason}"
225225
)
226226

227227
labels = [l['name'] for l in response.json()]
228228

229229
if new_label not in labels:
230-
breakpoint()
231230
response = self.session.post(
232-
f"{self.base_url}/repos/{repo.owner}/{repo.name}/issues/{issue['number']}/labels",
231+
f"{self.base_url}/repos/{repo.owner}/{repo.name}/issues/{issue['number']}/labels", # noqa: E501
233232
headers={"Accept": "application/vnd.github.symmetra-preview+json"},
234233
json={'labels': [f"{new_label}"]},
235234
)
236235
if response.status_code != 200:
237236
raise GitHubException(
238-
f"Error adding '{new_label}' for issue {repo.owner}/{repo.name}/issues/{issue['number']}: "
237+
f"Error adding '{new_label}' for issue {repo.owner}/{repo.name}/issues/{issue['number']}: " # noqa: E501
239238
f"{response.status_code} - "
240239
f"{response.reason}"
241240
)
242-
logger.debug(f"Added label '{new_label}' to {repo.owner}/{repo.name}/issue/{issue['number']}")
243-
241+
logger.debug(f"Added label '{new_label}' to {repo.owner}/{repo.name}/issue/{issue['number']}") # noqa: E501
244242

245243
def delete_label(self, repo: Repository, *, name: str) -> None:
246244
"""Delete a GitHub issue label.

0 commit comments

Comments
 (0)