Skip to content

Commit c63510d

Browse files
committed
format all native python code using black
1 parent dd1b59c commit c63510d

29 files changed

Lines changed: 727 additions & 665 deletions

benches/atom_memory_usage.py

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,17 @@
1616
eprint = lambda x: print(x, file=sys.stderr)
1717

1818
atom_funcs = [
19-
('pkgcraft', pkgcraft_atom),
20-
('pkgcraft-cached', pkgcraft_atom.cached),
21-
('pkgcore', pkgcore_atom),
22-
('portage', portage_atom),
19+
("pkgcraft", pkgcraft_atom),
20+
("pkgcraft-cached", pkgcraft_atom.cached),
21+
("pkgcore", pkgcore_atom),
22+
("portage", portage_atom),
2323
]
2424

25+
2526
def test(atoms):
26-
eprint('---------------------------------------')
27-
eprint('{:<20} {:<10} time'.format("implementation", "memory"))
28-
eprint('---------------------------------------')
27+
eprint("---------------------------------------")
28+
eprint("{:<20} {:<10} time".format("implementation", "memory"))
29+
eprint("---------------------------------------")
2930
for (impl, func) in atom_funcs:
3031
if pid := os.fork():
3132
os.wait()
@@ -40,14 +41,14 @@ def test(atoms):
4041
os._exit(0)
4142

4243

43-
if __name__ == '__main__':
44+
if __name__ == "__main__":
4445
num_atoms = 1000000
4546

4647
eprint(f"\nStatic atoms ({num_atoms})")
47-
test(('cat/pkg' for _ in range(num_atoms)))
48+
test(("cat/pkg" for _ in range(num_atoms)))
4849

4950
eprint(f"\nDynamic atoms ({num_atoms})")
50-
test((f'=cat/pkg-{x}-r1:2/3[a,b,c]' for x in range(num_atoms)))
51+
test((f"=cat/pkg-{x}-r1:2/3[a,b,c]" for x in range(num_atoms)))
5152

5253
eprint(f"\nRandom atoms ({num_atoms})")
53-
test((f'=cat/pkg-{randrange(9999)}-r1:2/3[a,b,c]' for _ in range(num_atoms)))
54+
test((f"=cat/pkg-{randrange(9999)}-r1:2/3[a,b,c]" for _ in range(num_atoms)))

benches/test_atom.py

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import pytest
22

3-
pytest_plugins = ('benchmark', 'pkgcraft')
3+
pytest_plugins = ("benchmark", "pkgcraft")
44

55
from pkgcore.ebuild.atom import atom as pkgcore_atom
66
from portage.dep import Atom as portage_atom
@@ -11,46 +11,53 @@
1111
def random_atom(func, random_str):
1212
cat = random_str()
1313
pkg = random_str()
14-
s = f'=cat_{cat}/pkg_{pkg}-1-r2:3/4=[a,b,c]'
14+
s = f"=cat_{cat}/pkg_{pkg}-1-r2:3/4=[a,b,c]"
1515
return func(s)
1616

17+
1718
atom_funcs = [
18-
('pkgcraft', pkgcraft_atom),
19-
('pkgcraft', pkgcraft_atom.cached),
20-
('pkgcore', pkgcore_atom),
21-
('portage', portage_atom),
19+
("pkgcraft", pkgcraft_atom),
20+
("pkgcraft", pkgcraft_atom.cached),
21+
("pkgcore", pkgcore_atom),
22+
("portage", portage_atom),
2223
]
2324

25+
2426
@pytest.mark.parametrize("lib,func", atom_funcs)
2527
def test_bench_atom_static(benchmark, lib, func):
26-
benchmark(func, '=cat/pkg-1-r2:3/4=[a,b,c]')
28+
benchmark(func, "=cat/pkg-1-r2:3/4=[a,b,c]")
29+
2730

2831
@pytest.mark.parametrize("lib,func", atom_funcs)
2932
def test_bench_atom_random(benchmark, random_str, lib, func):
3033
benchmark(random_atom, func, random_str)
3134

35+
3236
@pytest.mark.parametrize("lib,func", atom_funcs)
3337
def test_bench_atom_property(benchmark, lib, func):
34-
atom = func('=cat/pkg-1-r2:3/4=[a,b,c]')
35-
version = benchmark(getattr, atom, 'version')
36-
assert str(version).startswith('1')
38+
atom = func("=cat/pkg-1-r2:3/4=[a,b,c]")
39+
version = benchmark(getattr, atom, "version")
40+
assert str(version).startswith("1")
41+
3742

3843
@pytest.mark.parametrize("lib,func", atom_funcs)
3944
def test_bench_atom_property_none(benchmark, lib, func):
40-
atom = func('cat/pkg')
41-
version = benchmark(getattr, atom, 'version')
45+
atom = func("cat/pkg")
46+
version = benchmark(getattr, atom, "version")
4247
assert version is None
4348

49+
4450
# portage atoms don't natively support comparisons
45-
@pytest.mark.parametrize("lib,func", (('pkgcraft', pkgcraft_atom), ('pkgcore', pkgcore_atom)))
51+
@pytest.mark.parametrize("lib,func", (("pkgcraft", pkgcraft_atom), ("pkgcore", pkgcore_atom)))
4652
def test_bench_atom_sorting_worst_case(benchmark, lib, func):
47-
atoms = [func(f'=cat/pkg-{v}-r1:2/3=[a,b,c]') for v in reversed(range(100))]
53+
atoms = [func(f"=cat/pkg-{v}-r1:2/3=[a,b,c]") for v in reversed(range(100))]
4854
result = benchmark(sorted, atoms)
4955
assert result == list(reversed(atoms))
5056

57+
5158
# portage atoms don't natively support comparisons
52-
@pytest.mark.parametrize("lib,func", (('pkgcraft', pkgcraft_atom), ('pkgcore', pkgcore_atom)))
59+
@pytest.mark.parametrize("lib,func", (("pkgcraft", pkgcraft_atom), ("pkgcore", pkgcore_atom)))
5360
def test_bench_atom_sorting_best_case(benchmark, lib, func):
54-
atoms = [func(f'=cat/pkg-{v}-r1:2/3=[a,b,c]') for v in range(100)]
61+
atoms = [func(f"=cat/pkg-{v}-r1:2/3=[a,b,c]") for v in range(100)]
5562
result = benchmark(sorted, atoms)
5663
assert result == atoms

benches/test_ordered_set.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
import pytest
44

5-
pytest_plugins = ('benchmark',)
5+
pytest_plugins = ("benchmark",)
66

77
from ordered_set import OrderedSet as PyOrderedSet
88

99
from pkgcraft.set import OrderedSet as CyOrderedSet
1010

11-
set_types = [('cython', CyOrderedSet), ('python', PyOrderedSet), ('standard', set)]
11+
set_types = [("cython", CyOrderedSet), ("python", PyOrderedSet), ("standard", set)]
1212

1313

1414
@pytest.mark.parametrize("variant,cls", set_types)

benches/test_repo.py

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,25 @@
11
import pytest
22

3-
pytest_plugins = ('benchmark', 'pkgcraft')
3+
pytest_plugins = ("benchmark", "pkgcraft")
44

55
from pkgcore.ebuild.atom import atom as pkgcore_atom
66

77
from pkgcraft.atom import Atom
88
from pkgcraft.repo import RepoSet
99

1010

11-
@pytest.mark.parametrize("lib,func", (('pkgcraft', Atom), ('pkgcore', pkgcore_atom)))
11+
@pytest.mark.parametrize("lib,func", (("pkgcraft", Atom), ("pkgcore", pkgcore_atom)))
1212
def test_bench_ebuild_repo_iter(benchmark, lib, func, ebuild_repo):
1313
# create ebuilds
1414
for i in range(100):
15-
ebuild_repo.create_ebuild(f'cat/pkg-{i}')
15+
ebuild_repo.create_ebuild(f"cat/pkg-{i}")
1616

17-
if lib == 'pkgcore':
17+
if lib == "pkgcore":
1818
from pkgcore.ebuild import repo_objs, repository
19-
repo_config = repo_objs.RepoConfig(location=str(ebuild_repo.path), disable_inst_caching=True)
19+
20+
repo_config = repo_objs.RepoConfig(
21+
location=str(ebuild_repo.path), disable_inst_caching=True
22+
)
2023
r = repository.UnconfiguredTree(str(ebuild_repo.path), repo_config=repo_config)
2124
pkgs = benchmark(lambda x: list(iter(x)), r)
2225
else:
@@ -25,54 +28,57 @@ def test_bench_ebuild_repo_iter(benchmark, lib, func, ebuild_repo):
2528
assert len(pkgs) == 100
2629

2730

28-
@pytest.mark.parametrize("lib,func", (('pkgcraft', Atom), ('pkgcore', pkgcore_atom)))
31+
@pytest.mark.parametrize("lib,func", (("pkgcraft", Atom), ("pkgcore", pkgcore_atom)))
2932
def test_bench_ebuild_repo_iter_restrict_atom(benchmark, lib, func, ebuild_repo):
3033
# create ebuilds
3134
for i in range(100):
32-
ebuild_repo.create_ebuild(f'cat/pkg-{i}')
35+
ebuild_repo.create_ebuild(f"cat/pkg-{i}")
3336

3437
# single atom restriction
35-
atom = func('=cat/pkg-50')
38+
atom = func("=cat/pkg-50")
3639

37-
if lib == 'pkgcore':
40+
if lib == "pkgcore":
3841
from pkgcore.ebuild import repo_objs, repository
39-
repo_config = repo_objs.RepoConfig(location=str(ebuild_repo.path), disable_inst_caching=True)
42+
43+
repo_config = repo_objs.RepoConfig(
44+
location=str(ebuild_repo.path), disable_inst_caching=True
45+
)
4046
r = repository.UnconfiguredTree(str(ebuild_repo.path), repo_config=repo_config)
4147
pkgs = benchmark(lambda x: list(r.itermatch(x)), atom)
4248
else:
4349
pkgs = benchmark(lambda x: list(ebuild_repo.iter_restrict(x)), atom)
4450

4551
assert len(pkgs) == 1
46-
assert str(pkgs[0].version) == '50'
52+
assert str(pkgs[0].version) == "50"
4753

4854

4955
def test_bench_fake_repo_iter(benchmark, fake_repo):
5056
# create pkgs
51-
fake_repo.extend([f'cat/pkg-{i}' for i in range(100)])
57+
fake_repo.extend([f"cat/pkg-{i}" for i in range(100)])
5258
pkgs = benchmark(lambda x: list(iter(x)), fake_repo)
5359
assert len(pkgs) == 100
5460

5561

5662
def test_bench_fake_repo_iter_restrict_atom(benchmark, fake_repo):
5763
# create pkgs
58-
fake_repo.extend([f'cat/pkg-{i}' for i in range(100)])
64+
fake_repo.extend([f"cat/pkg-{i}" for i in range(100)])
5965

6066
# single atom restriction
61-
atom = Atom('=cat/pkg-50')
67+
atom = Atom("=cat/pkg-50")
6268

6369
pkgs = benchmark(lambda x: list(fake_repo.iter_restrict(x)), atom)
6470
assert len(pkgs) == 1
65-
assert str(pkgs[0].version) == '50'
71+
assert str(pkgs[0].version) == "50"
6672

6773

6874
def test_bench_repo_set_iter(benchmark, make_ebuild_repo):
6975
r1 = make_ebuild_repo()
7076
r2 = make_ebuild_repo()
7177
# create ebuilds
7278
for i in range(50):
73-
r1.create_ebuild(f'cat/pkg-{i}')
79+
r1.create_ebuild(f"cat/pkg-{i}")
7480
for i in range(50, 100):
75-
r2.create_ebuild(f'cat/pkg-{i}')
81+
r2.create_ebuild(f"cat/pkg-{i}")
7682

7783
repos = RepoSet(r1, r2)
7884
pkgs = benchmark(lambda x: list(iter(x)), repos)
@@ -84,15 +90,15 @@ def test_bench_repo_set_iter_restrict_atom(benchmark, make_ebuild_repo):
8490
r2 = make_ebuild_repo()
8591
# create ebuilds
8692
for i in range(50):
87-
r1.create_ebuild(f'cat/pkg-{i}')
93+
r1.create_ebuild(f"cat/pkg-{i}")
8894
for i in range(50, 100):
89-
r2.create_ebuild(f'cat/pkg-{i}')
95+
r2.create_ebuild(f"cat/pkg-{i}")
9096

9197
# single atom restriction
92-
atom = Atom('=cat/pkg-50')
98+
atom = Atom("=cat/pkg-50")
9399

94100
repos = RepoSet(r1, r2)
95101
pkgs = benchmark(lambda x: list(repos.iter_restrict(x)), atom)
96102

97103
assert len(pkgs) == 1
98-
assert str(pkgs[0].version) == '50'
104+
assert str(pkgs[0].version) == "50"

examples/eapi-usage

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ from pkgcraft.logging import logger
1414

1515
def main():
1616
parser = argparse.ArgumentParser()
17-
parser.add_argument('--quiet', '-q', action='count', default=0)
18-
parser.add_argument('--verbose', '-v', action='count', default=0)
19-
parser.add_argument('--repo', '-r', default='gentoo')
17+
parser.add_argument("--quiet", "-q", action="count", default=0)
18+
parser.add_argument("--verbose", "-v", action="count", default=0)
19+
parser.add_argument("--repo", "-r", default="gentoo")
2020
args = parser.parse_args()
2121

2222
# set logging level, defaulting to warning
@@ -41,8 +41,8 @@ def main():
4141

4242
# output EAPI usage in descending order
4343
for (eapi, cpvs) in sorted(eapis.items(), key=lambda x: len(x[1]), reverse=True):
44-
print(f'EAPI {eapi}: {len(cpvs)} pkgs')
44+
print(f"EAPI {eapi}: {len(cpvs)} pkgs")
4545

4646

47-
if __name__ == '__main__':
47+
if __name__ == "__main__":
4848
main()

examples/leaf-pkgs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ from pkgcraft.logging import logger
1515

1616
def main():
1717
parser = argparse.ArgumentParser()
18-
parser.add_argument('--quiet', '-q', action='count', default=0)
19-
parser.add_argument('--verbose', '-v', action='count', default=0)
20-
parser.add_argument('--repo', '-r', default='gentoo')
18+
parser.add_argument("--quiet", "-q", action="count", default=0)
19+
parser.add_argument("--verbose", "-v", action="count", default=0)
20+
parser.add_argument("--repo", "-r", default="gentoo")
2121
args = parser.parse_args()
2222

2323
# set logging level, defaulting to warning
@@ -56,5 +56,5 @@ def main():
5656
print(cpv)
5757

5858

59-
if __name__ == '__main__':
59+
if __name__ == "__main__":
6060
main()

examples/query

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,19 @@ from pkgcraft.restrict import Restrict
3232

3333
def main():
3434
parser = argparse.ArgumentParser()
35-
parser.add_argument('--quiet', '-q', action='count', default=0)
36-
parser.add_argument('--verbose', '-v', action='count', default=0)
37-
parser.add_argument('--repo', '-r', metavar='REPO_PATH', dest='repos', action='append')
38-
parser.add_argument('--restrict', metavar='RESTRICT', dest='restricts', action='append')
39-
parser.add_argument('targets', metavar='TARGET', nargs='*')
35+
parser.add_argument("--quiet", "-q", action="count", default=0)
36+
parser.add_argument("--verbose", "-v", action="count", default=0)
37+
parser.add_argument("--repo", "-r", metavar="REPO_PATH", dest="repos", action="append")
38+
parser.add_argument("--restrict", metavar="RESTRICT", dest="restricts", action="append")
39+
parser.add_argument("targets", metavar="TARGET", nargs="*")
4040
args = parser.parse_args()
4141

4242
# set logging level, defaulting to warning
4343
level = logging.WARNING + (args.quiet - args.verbose) * 10
4444
logger.setLevel(level)
4545

4646
if not (args.restricts or args.targets):
47-
parser.error('restrictions and/or targets must be specified')
47+
parser.error("restrictions and/or targets must be specified")
4848

4949
def str_to_restrict(convert, combine, args):
5050
try:
@@ -55,11 +55,9 @@ def main():
5555
# convert strings to restrictions
5656
restricts = []
5757
if args.restricts:
58-
restricts.append(str_to_restrict(
59-
Restrict.pkg, lambda x, y: x & y, args.restricts))
58+
restricts.append(str_to_restrict(Restrict.pkg, lambda x, y: x & y, args.restricts))
6059
if args.targets:
61-
restricts.append(str_to_restrict(
62-
Restrict.dep, lambda x, y: x | y, args.targets))
60+
restricts.append(str_to_restrict(Restrict.dep, lambda x, y: x | y, args.targets))
6361

6462
# combine pkg and target restrictions
6563
r = reduce(lambda x, y: x & y, restricts)
@@ -79,5 +77,5 @@ def main():
7977
print(pkg)
8078

8179

82-
if __name__ == '__main__':
80+
if __name__ == "__main__":
8381
main()

examples/revdeps

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ from pkgcraft.restrict import Restrict
1313

1414
def main():
1515
parser = argparse.ArgumentParser()
16-
parser.add_argument('--quiet', '-q', action='count', default=0)
17-
parser.add_argument('--verbose', '-v', action='count', default=0)
18-
parser.add_argument('--repo', '-r', metavar='REPO_PATH', dest='repos', action='append')
19-
parser.add_argument('dep')
16+
parser.add_argument("--quiet", "-q", action="count", default=0)
17+
parser.add_argument("--verbose", "-v", action="count", default=0)
18+
parser.add_argument("--repo", "-r", metavar="REPO_PATH", dest="repos", action="append")
19+
parser.add_argument("dep")
2020
args = parser.parse_args()
2121

2222
# set logging level, defaulting to warning
@@ -43,8 +43,8 @@ def main():
4343
for pkg in config.repos.ebuild:
4444
for (attr, deps) in ((k, deps) for k in dep_keys if (deps := getattr(pkg, k.lower()))):
4545
for a in filter(restrict.matches, deps.iter_flatten()):
46-
print(f'{pkg}: {attr}: {a}')
46+
print(f"{pkg}: {attr}: {a}")
4747

4848

49-
if __name__ == '__main__':
49+
if __name__ == "__main__":
5050
main()

0 commit comments

Comments
 (0)