Skip to content

gh-91324: Convert the stable ABI manifest to TOML #92026

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
encukou merged 7 commits into from
Apr 29, 2022
Merged

gh-91324: Convert the stable ABI manifest to TOML #92026

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e5c29c3
Make stable_abi.py --dump generate TOML
encukou Mar 23, 2022
d6b554d
Convert Misc/stable_abi to TOML
encukou Mar 23, 2022
b2280f6
Add a helper to check manifest.dump()
encukou Apr 22, 2022
2576f83
Use the term 'feature macro' instead of 'ifdef'
encukou Apr 22, 2022
9976752
Remove testing exceptions
encukou Apr 27, 2022
3f74e35
rovide a better error message when someone uses .txt
encukou Apr 29, 2022
81ca69e
Revert "Remove testing exceptions"
encukou Apr 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add a helper to check manifest.dump() 
This is just for debugging, but I don't want to lose it.
  • Loading branch information
@encukou
encukou committed Apr 28, 2022
commit b2280f6e772075266061c76c313411661b81f3cd
25 changes: 24 additions & 1 deletion Tools/scripts/stable_abi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import tomllib
import difflib
import shutil
import pprint
import sys
import os
import os.path
Expand Down Expand Up @@ -602,6 +603,28 @@ def check_private_names(manifest):
f'`{name}` is private (underscore-prefixed) and should be '
+ 'removed from the stable ABI list or or marked `abi_only`')

def check_dump(manifest, filename):
"""Check that manifest.dump() corresponds to the data.

Mainly useful when debugging this script.
"""
dumped = tomllib.loads('\n'.join(manifest.dump()))
with filename.open('rb') as file:
from_file = tomllib.load(file)
if dumped != from_file:
print(f'Dump differs from loaded data!', file=sys.stderr)
diff = difflib.unified_diff(
pprint.pformat(dumped).splitlines(),
pprint.pformat(from_file).splitlines(),
'<dumped>', str(filename),
lineterm='',
)
for line in diff:
print(line, file=sys.stderr)
return False
else:
return True

def main():
parser = argparse.ArgumentParser(
description=__doc__,
Expand Down Expand Up @@ -676,7 +699,7 @@ def main():
if args.dump:
for line in manifest.dump():
print(line)
results['dump'] = True
results['dump'] = check_dump(manifest, args.file)

for gen in generators:
filename = getattr(args, gen.var_name)
Expand Down