Skip to content

Commit 0cdde58

Browse files
DimitriPapadopoulosDimitriPapadopoulos
committed
Run ruff format 
1 parent 71a1dd2 commit 0cdde58

22 files changed

+69
-74
lines changed

‎backend/src/hatchling/builders/config.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ def include_spec(self) -> pathspec.GitIgnoreSpec | None:
141141

142142
# Matching only at the root requires a forward slash, back slashes do not work. As such,
143143
# normalize to forward slashes for consistency.
144-
all_include_patterns.extend(f"/{relative_path.replace(os.sep, '/')}/" for relative_path in self.packages)
144+
all_include_patterns.extend(f'/{relative_path.replace(os.sep, "/")}/' for relative_path in self.packages)
145145

146146
if all_include_patterns:
147147
return pathspec.GitIgnoreSpec.from_lines(all_include_patterns)

‎backend/src/hatchling/builders/sdist.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -230,15 +230,15 @@ def construct_setup_py_file(self, packages: list[str], extra_dependencies: tuple
230230

231231
authors_data = self.metadata.core.authors_data
232232
if authors_data['name']:
233-
contents += f" author={', '.join(authors_data['name'])!r},\n"
233+
contents += f' author={", ".join(authors_data["name"])!r},\n'
234234
if authors_data['email']:
235-
contents += f" author_email={', '.join(authors_data['email'])!r},\n"
235+
contents += f' author_email={", ".join(authors_data["email"])!r},\n'
236236

237237
maintainers_data = self.metadata.core.maintainers_data
238238
if maintainers_data['name']:
239-
contents += f" maintainer={', '.join(maintainers_data['name'])!r},\n"
239+
contents += f' maintainer={", ".join(maintainers_data["name"])!r},\n'
240240
if maintainers_data['email']:
241-
contents += f" maintainer_email={', '.join(maintainers_data['email'])!r},\n"
241+
contents += f' maintainer_email={", ".join(maintainers_data["email"])!r},\n'
242242

243243
if self.metadata.core.classifiers:
244244
contents += ' classifiers=[\n'
@@ -313,9 +313,9 @@ def construct_setup_py_file(self, packages: list[str], extra_dependencies: tuple
313313
for package in packages:
314314
if package.startswith(f'src{os.sep}'):
315315
src_layout = True
316-
contents += f" {package.replace(os.sep, '.')[4:]!r},\n"
316+
contents += f' {package.replace(os.sep, ".")[4:]!r},\n'
317317
else:
318-
contents += f" {package.replace(os.sep, '.')!r},\n"
318+
contents += f' {package.replace(os.sep, ".")!r},\n'
319319

320320
contents += ' ],\n'
321321

‎backend/src/hatchling/builders/wheel.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ def build_standard(self, directory: str, **build_data: Any) -> str:
483483
records.write((f'{archive.metadata_directory}/RECORD', '', ''))
484484
archive.write_metadata('RECORD', records.construct())
485485

486-
target = os.path.join(directory, f"{self.artifact_project_id}-{build_data['tag']}.whl")
486+
target = os.path.join(directory, f'{self.artifact_project_id}-{build_data["tag"]}.whl')
487487

488488
replace_file(archive.path, target)
489489
normalize_artifact_permissions(target)
@@ -572,7 +572,7 @@ def build_editable_detection(self, directory: str, **build_data: Any) -> str:
572572
records.write((f'{archive.metadata_directory}/RECORD', '', ''))
573573
archive.write_metadata('RECORD', records.construct())
574574

575-
target = os.path.join(directory, f"{self.artifact_project_id}-{build_data['tag']}.whl")
575+
target = os.path.join(directory, f'{self.artifact_project_id}-{build_data["tag"]}.whl')
576576

577577
replace_file(archive.path, target)
578578
normalize_artifact_permissions(target)
@@ -589,7 +589,7 @@ def build_editable_explicit(self, directory: str, **build_data: Any) -> str:
589589
for relative_directory in self.config.dev_mode_dirs
590590
)
591591

592-
record = archive.write_file(f"_{self.metadata.core.name.replace('-', '_')}.pth", '\n'.join(directories))
592+
record = archive.write_file(f'_{self.metadata.core.name.replace("-", "_")}.pth', '\n'.join(directories))
593593
records.write(record)
594594

595595
for included_file in self.recurse_forced_files(self.get_forced_inclusion_map(build_data)):
@@ -601,7 +601,7 @@ def build_editable_explicit(self, directory: str, **build_data: Any) -> str:
601601
records.write((f'{archive.metadata_directory}/RECORD', '', ''))
602602
archive.write_metadata('RECORD', records.construct())
603603

604-
target = os.path.join(directory, f"{self.artifact_project_id}-{build_data['tag']}.whl")
604+
target = os.path.join(directory, f'{self.artifact_project_id}-{build_data["tag"]}.whl')
605605

606606
replace_file(archive.path, target)
607607
normalize_artifact_permissions(target)

‎backend/src/hatchling/cli/build/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def build_impl(
5252
builders[target_name] = builder_class
5353

5454
if unknown_targets:
55-
app.abort(f"Unknown build targets: {', '.join(sorted(unknown_targets))}")
55+
app.abort(f'Unknown build targets: {", ".join(sorted(unknown_targets))}')
5656

5757
# We guarantee that builds occur within the project directory
5858
root = os.getcwd()

‎backend/src/hatchling/metadata/spec.py

+25-25
Original file line numberDiff line numberDiff line change
@@ -214,15 +214,15 @@ def construct_metadata_file_1_2(metadata: ProjectMetadata, extra_dependencies: t
214214

215215
authors_data = metadata.core.authors_data
216216
if authors_data['name']:
217-
metadata_file += f"Author: {', '.join(authors_data['name'])}\n"
217+
metadata_file += f'Author: {", ".join(authors_data["name"])}\n'
218218
if authors_data['email']:
219-
metadata_file += f"Author-email: {', '.join(authors_data['email'])}\n"
219+
metadata_file += f'Author-email: {", ".join(authors_data["email"])}\n'
220220

221221
maintainers_data = metadata.core.maintainers_data
222222
if maintainers_data['name']:
223-
metadata_file += f"Maintainer: {', '.join(maintainers_data['name'])}\n"
223+
metadata_file += f'Maintainer: {", ".join(maintainers_data["name"])}\n'
224224
if maintainers_data['email']:
225-
metadata_file += f"Maintainer-email: {', '.join(maintainers_data['email'])}\n"
225+
metadata_file += f'Maintainer-email: {", ".join(maintainers_data["email"])}\n'
226226

227227
if metadata.core.license:
228228
license_start = 'License: '
@@ -238,7 +238,7 @@ def construct_metadata_file_1_2(metadata: ProjectMetadata, extra_dependencies: t
238238
metadata_file += f'License: {metadata.core.license_expression}\n'
239239

240240
if metadata.core.keywords:
241-
metadata_file += f"Keywords: {','.join(metadata.core.keywords)}\n"
241+
metadata_file += f'Keywords: {",".join(metadata.core.keywords)}\n'
242242

243243
if metadata.core.classifiers:
244244
for classifier in metadata.core.classifiers:
@@ -275,15 +275,15 @@ def construct_metadata_file_2_1(metadata: ProjectMetadata, extra_dependencies: t
275275

276276
authors_data = metadata.core.authors_data
277277
if authors_data['name']:
278-
metadata_file += f"Author: {', '.join(authors_data['name'])}\n"
278+
metadata_file += f'Author: {", ".join(authors_data["name"])}\n'
279279
if authors_data['email']:
280-
metadata_file += f"Author-email: {', '.join(authors_data['email'])}\n"
280+
metadata_file += f'Author-email: {", ".join(authors_data["email"])}\n'
281281

282282
maintainers_data = metadata.core.maintainers_data
283283
if maintainers_data['name']:
284-
metadata_file += f"Maintainer: {', '.join(maintainers_data['name'])}\n"
284+
metadata_file += f'Maintainer: {", ".join(maintainers_data["name"])}\n'
285285
if maintainers_data['email']:
286-
metadata_file += f"Maintainer-email: {', '.join(maintainers_data['email'])}\n"
286+
metadata_file += f'Maintainer-email: {", ".join(maintainers_data["email"])}\n'
287287

288288
if metadata.core.license:
289289
license_start = 'License: '
@@ -299,7 +299,7 @@ def construct_metadata_file_2_1(metadata: ProjectMetadata, extra_dependencies: t
299299
metadata_file += f'License: {metadata.core.license_expression}\n'
300300

301301
if metadata.core.keywords:
302-
metadata_file += f"Keywords: {','.join(metadata.core.keywords)}\n"
302+
metadata_file += f'Keywords: {",".join(metadata.core.keywords)}\n'
303303

304304
if metadata.core.classifiers:
305305
for classifier in metadata.core.classifiers:
@@ -361,15 +361,15 @@ def construct_metadata_file_2_2(metadata: ProjectMetadata, extra_dependencies: t
361361

362362
authors_data = metadata.core.authors_data
363363
if authors_data['name']:
364-
metadata_file += f"Author: {', '.join(authors_data['name'])}\n"
364+
metadata_file += f'Author: {", ".join(authors_data["name"])}\n'
365365
if authors_data['email']:
366-
metadata_file += f"Author-email: {', '.join(authors_data['email'])}\n"
366+
metadata_file += f'Author-email: {", ".join(authors_data["email"])}\n'
367367

368368
maintainers_data = metadata.core.maintainers_data
369369
if maintainers_data['name']:
370-
metadata_file += f"Maintainer: {', '.join(maintainers_data['name'])}\n"
370+
metadata_file += f'Maintainer: {", ".join(maintainers_data["name"])}\n'
371371
if maintainers_data['email']:
372-
metadata_file += f"Maintainer-email: {', '.join(maintainers_data['email'])}\n"
372+
metadata_file += f'Maintainer-email: {", ".join(maintainers_data["email"])}\n'
373373

374374
if metadata.core.license:
375375
license_start = 'License: '
@@ -385,7 +385,7 @@ def construct_metadata_file_2_2(metadata: ProjectMetadata, extra_dependencies: t
385385
metadata_file += f'License: {metadata.core.license_expression}\n'
386386

387387
if metadata.core.keywords:
388-
metadata_file += f"Keywords: {','.join(metadata.core.keywords)}\n"
388+
metadata_file += f'Keywords: {",".join(metadata.core.keywords)}\n'
389389

390390
if metadata.core.classifiers:
391391
for classifier in metadata.core.classifiers:
@@ -447,15 +447,15 @@ def construct_metadata_file_2_3(metadata: ProjectMetadata, extra_dependencies: t
447447

448448
authors_data = metadata.core.authors_data
449449
if authors_data['name']:
450-
metadata_file += f"Author: {', '.join(authors_data['name'])}\n"
450+
metadata_file += f'Author: {", ".join(authors_data["name"])}\n'
451451
if authors_data['email']:
452-
metadata_file += f"Author-email: {', '.join(authors_data['email'])}\n"
452+
metadata_file += f'Author-email: {", ".join(authors_data["email"])}\n'
453453

454454
maintainers_data = metadata.core.maintainers_data
455455
if maintainers_data['name']:
456-
metadata_file += f"Maintainer: {', '.join(maintainers_data['name'])}\n"
456+
metadata_file += f'Maintainer: {", ".join(maintainers_data["name"])}\n'
457457
if maintainers_data['email']:
458-
metadata_file += f"Maintainer-email: {', '.join(maintainers_data['email'])}\n"
458+
metadata_file += f'Maintainer-email: {", ".join(maintainers_data["email"])}\n'
459459

460460
if metadata.core.license:
461461
license_start = 'License: '
@@ -471,7 +471,7 @@ def construct_metadata_file_2_3(metadata: ProjectMetadata, extra_dependencies: t
471471
metadata_file += f'License: {metadata.core.license_expression}\n'
472472

473473
if metadata.core.keywords:
474-
metadata_file += f"Keywords: {','.join(metadata.core.keywords)}\n"
474+
metadata_file += f'Keywords: {",".join(metadata.core.keywords)}\n'
475475

476476
if metadata.core.classifiers:
477477
for classifier in metadata.core.classifiers:
@@ -533,15 +533,15 @@ def construct_metadata_file_2_4(metadata: ProjectMetadata, extra_dependencies: t
533533

534534
authors_data = metadata.core.authors_data
535535
if authors_data['name']:
536-
metadata_file += f"Author: {', '.join(authors_data['name'])}\n"
536+
metadata_file += f'Author: {", ".join(authors_data["name"])}\n'
537537
if authors_data['email']:
538-
metadata_file += f"Author-email: {', '.join(authors_data['email'])}\n"
538+
metadata_file += f'Author-email: {", ".join(authors_data["email"])}\n'
539539

540540
maintainers_data = metadata.core.maintainers_data
541541
if maintainers_data['name']:
542-
metadata_file += f"Maintainer: {', '.join(maintainers_data['name'])}\n"
542+
metadata_file += f'Maintainer: {", ".join(maintainers_data["name"])}\n'
543543
if maintainers_data['email']:
544-
metadata_file += f"Maintainer-email: {', '.join(maintainers_data['email'])}\n"
544+
metadata_file += f'Maintainer-email: {", ".join(maintainers_data["email"])}\n'
545545

546546
if metadata.core.license:
547547
license_start = 'License: '
@@ -562,7 +562,7 @@ def construct_metadata_file_2_4(metadata: ProjectMetadata, extra_dependencies: t
562562
metadata_file += f'License-File: {license_file}\n'
563563

564564
if metadata.core.keywords:
565-
metadata_file += f"Keywords: {','.join(metadata.core.keywords)}\n"
565+
metadata_file += f'Keywords: {",".join(metadata.core.keywords)}\n'
566566

567567
if metadata.core.classifiers:
568568
for classifier in metadata.core.classifiers:

‎src/hatch/cli/build/__init__.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
'targets',
1717
multiple=True,
1818
help=(
19-
'The target to build, overriding project defaults. '
20-
'This may be selected multiple times e.g. `-t sdist -t wheel`'
19+
'The target to build, overriding project defaults. This may be selected multiple times e.g. `-t sdist -t wheel`'
2120
),
2221
)
2322
@click.option(

‎src/hatch/env/plugin/interface.py

+3-6
Original file line numberDiff line numberDiff line change
@@ -453,8 +453,7 @@ def scripts(self):
453453
for name, data in script_config.items():
454454
if ' ' in name:
455455
message = (
456-
f'Script name `{name}` in field `tool.hatch.envs.{self.name}.{field}` '
457-
f'must not contain spaces'
456+
f'Script name `{name}` in field `tool.hatch.envs.{self.name}.{field}` must not contain spaces'
458457
)
459458
raise ValueError(message)
460459

@@ -466,16 +465,14 @@ def scripts(self):
466465
for i, command in enumerate(data, 1):
467466
if not isinstance(command, str):
468467
message = (
469-
f'Command #{i} in field `tool.hatch.envs.{self.name}.{field}.{name}` '
470-
f'must be a string'
468+
f'Command #{i} in field `tool.hatch.envs.{self.name}.{field}.{name}` must be a string'
471469
)
472470
raise TypeError(message)
473471

474472
commands.append(command)
475473
else:
476474
message = (
477-
f'Field `tool.hatch.envs.{self.name}.{field}.{name}` must be '
478-
f'a string or an array of strings'
475+
f'Field `tool.hatch.envs.{self.name}.{field}.{name}` must be a string or an array of strings'
479476
)
480477
raise TypeError(message)
481478

‎src/hatch/template/files_default.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def __init__(
5252
if template_config['license_data']:
5353
extra_toc += '- [License](#license)\n'
5454
license_info += (
55-
f"\n\n## License\n\n`{template_config['project_name_normalized']}` is distributed under the terms of "
55+
f'\n\n## License\n\n`{template_config["project_name_normalized"]}` is distributed under the terms of '
5656
)
5757

5858
license_data = template_config['license_data']

‎tests/backend/metadata/test_core.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -615,8 +615,7 @@ def test_dynamic(self, isolation):
615615
with pytest.raises(
616616
ValueError,
617617
match=(
618-
'Metadata field `license-files` cannot be both statically defined and '
619-
'listed in field `project.dynamic`'
618+
'Metadata field `license-files` cannot be both statically defined and listed in field `project.dynamic`'
620619
),
621620
):
622621
_ = metadata.core.license_files

‎tests/helpers/templates/new/basic.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ def get_files(**kwargs):
88
return [
99
File(
1010
Path('LICENSE.txt'),
11-
MIT.replace('<year>', f"{kwargs['year']}-present", 1).replace(
12-
'<copyright holders>', f"{kwargs['author']} <{kwargs['email']}>", 1
11+
MIT.replace('<year>', f'{kwargs["year"]}-present', 1).replace(
12+
'<copyright holders>', f'{kwargs["author"]} <{kwargs["email"]}>', 1
1313
),
1414
),
1515
File(

‎tests/helpers/templates/new/default.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ def get_files(**kwargs):
1010
return [
1111
File(
1212
Path('LICENSE.txt'),
13-
MIT.replace('<year>', f"{kwargs['year']}-present", 1).replace(
14-
'<copyright holders>', f"{kwargs['author']} <{kwargs['email']}>", 1
13+
MIT.replace('<year>', f'{kwargs["year"]}-present', 1).replace(
14+
'<copyright holders>', f'{kwargs["author"]} <{kwargs["email"]}>', 1
1515
),
1616
),
1717
File(

‎tests/helpers/templates/new/feature_cli.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ def get_files(**kwargs):
88
return [
99
File(
1010
Path('LICENSE.txt'),
11-
MIT.replace('<year>', f"{kwargs['year']}-present", 1).replace(
12-
'<copyright holders>', f"{kwargs['author']} <{kwargs['email']}>", 1
11+
MIT.replace('<year>', f'{kwargs["year"]}-present', 1).replace(
12+
'<copyright holders>', f'{kwargs["author"]} <{kwargs["email"]}>', 1
1313
),
1414
),
1515
File(

‎tests/helpers/templates/new/feature_no_src_layout.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ def get_files(**kwargs):
1010
return [
1111
File(
1212
Path('LICENSE.txt'),
13-
MIT.replace('<year>', f"{kwargs['year']}-present", 1).replace(
14-
'<copyright holders>', f"{kwargs['author']} <{kwargs['email']}>", 1
13+
MIT.replace('<year>', f'{kwargs["year"]}-present', 1).replace(
14+
'<copyright holders>', f'{kwargs["author"]} <{kwargs["email"]}>', 1
1515
),
1616
),
1717
File(

‎tests/helpers/templates/new/licenses_multiple.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ def get_files(**kwargs):
99
File(Path('LICENSES', 'Apache-2.0.txt'), Apache_2_0),
1010
File(
1111
Path('LICENSES', 'MIT.txt'),
12-
MIT.replace('<year>', f"{kwargs['year']}-present", 1).replace(
13-
'<copyright holders>', f"{kwargs['author']} <{kwargs['email']}>", 1
12+
MIT.replace('<year>', f'{kwargs["year"]}-present', 1).replace(
13+
'<copyright holders>', f'{kwargs["author"]} <{kwargs["email"]}>', 1
1414
),
1515
),
1616
File(

‎tests/helpers/templates/new/projects_urls_empty.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ def get_files(**kwargs):
88
return [
99
File(
1010
Path('LICENSE.txt'),
11-
MIT.replace('<year>', f"{kwargs['year']}-present", 1).replace(
12-
'<copyright holders>', f"{kwargs['author']} <{kwargs['email']}>", 1
11+
MIT.replace('<year>', f'{kwargs["year"]}-present', 1).replace(
12+
'<copyright holders>', f'{kwargs["author"]} <{kwargs["email"]}>', 1
1313
),
1414
),
1515
File(

‎tests/helpers/templates/new/projects_urls_space_in_label.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ def get_files(**kwargs):
88
return [
99
File(
1010
Path('LICENSE.txt'),
11-
MIT.replace('<year>', f"{kwargs['year']}-present", 1).replace(
12-
'<copyright holders>', f"{kwargs['author']} <{kwargs['email']}>", 1
11+
MIT.replace('<year>', f'{kwargs["year"]}-present', 1).replace(
12+
'<copyright holders>', f'{kwargs["author"]} <{kwargs["email"]}>', 1
1313
),
1414
),
1515
File(

‎tests/helpers/templates/wheel/standard_editable_exact.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ def get_files(**kwargs):
1717
if str(f.path) == 'LICENSE.txt'
1818
]
1919

20-
pth_file_name = f"_{kwargs['package_name']}.pth"
21-
loader_file_name = f"_editable_impl_{kwargs['package_name']}.py"
20+
pth_file_name = f'_{kwargs["package_name"]}.pth'
21+
loader_file_name = f'_editable_impl_{kwargs["package_name"]}.py'
2222
files.extend((
23-
File(Path(pth_file_name), f"import _editable_impl_{kwargs['package_name']}"),
23+
File(Path(pth_file_name), f'import _editable_impl_{kwargs["package_name"]}'),
2424
File(
2525
Path(loader_file_name),
2626
f"""\

‎tests/helpers/templates/wheel/standard_editable_exact_extra_dependencies.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ def get_files(**kwargs):
1717
if str(f.path) == 'LICENSE.txt'
1818
]
1919

20-
pth_file_name = f"_{kwargs['package_name']}.pth"
21-
loader_file_name = f"_editable_impl_{kwargs['package_name']}.py"
20+
pth_file_name = f'_{kwargs["package_name"]}.pth'
21+
loader_file_name = f'_editable_impl_{kwargs["package_name"]}.py'
2222
files.extend((
23-
File(Path(pth_file_name), f"import _editable_impl_{kwargs['package_name']}"),
23+
File(Path(pth_file_name), f'import _editable_impl_{kwargs["package_name"]}'),
2424
File(
2525
Path(loader_file_name),
2626
f"""\

0 commit comments

Comments
 (0)